Merge pull request #354 from npawelek/maas-fix-holland

Fix issue preventing Holland from deploying on all supported rpc-o versions

Author: major

playbooks/files/rax-maas/plugins/holland_local_check.py

@@ -55,7 +55,7 @@ def parse_args():
 
 
 def print_metrics(name, size):
-    metric('hollabd_backup_size', 'double', size, 'Megabytes')
+    metric('holland_backup_size', 'double', size, 'Megabytes')
 
 
 def container_holland_lb_check(container, binary, backupset):

playbooks/maas-infra-galera.yml

@@ -42,15 +42,6 @@
       when:
         - ansible_distribution | lower == 'ubuntu'
 
-    - name: Check for holland
-      stat:
-        path: "{{ maas_holland_venv_bin }}"
-      register: holland_check
-
-    - name: Set holland enabled fact disabled
-      set_fact:
-        holland_check_disabled: "{{ not holland_check.stat.exists }}"
-
     - name: Install holland check
       template:
         src: "templates/rax-maas/holland_local_check.yaml.j2"
@@ -60,7 +51,7 @@
         mode: "0644"
       delegate_to: "{{ physical_host | default(ansible_host) }}"
       when:
-        - not holland_check_disabled | bool
+        - maas_holland_enabled
       notify:
         - Restart rax-maas
 

playbooks/templates/rax-maas/holland_local_check.yaml.j2

@@ -1,13 +1,14 @@
 {% set label = "holland_local_check" %}
 {% set check_name = label+'--'+inventory_hostname %}
+{% set holland_venv_bin = (maas_holland_venv_enabled | bool | ternary(maas_holland_venv_bin,'/usr/local/bin')) %}
 type        : agent.plugin
 label       : "{{ check_name }}"
 period      : "{{ maas_check_period_override[label] | default(maas_check_period) }}"
 timeout     : "{{ maas_check_timeout_override[label] | default(maas_check_timeout) }}"
 disabled    : "{{ (check_name | match(maas_excluded_checks_regex)) | ternary('true', 'false') }}"
 details     :
     file    : run_plugin_in_venv.sh
-    args    : ["{{ maas_plugin_dir }}holland_local_check.py", "{{ container_name }}", "{{ holland_venv_bin + '/holland' }}"]
+    args    : ["{{ maas_plugin_dir }}/holland_local_check.py", "{{ container_name }}", "{{ holland_venv_bin + '/holland' }}"]
 alarms      :
      holland_backup_status:
         label                   : holland_backup_status--{{ inventory_hostname }}

playbooks/vars/maas-infra.yml

@@ -19,7 +19,7 @@ elasticsearch_process_names:
 filebeat_process_names:
   - filebeat
 
-maas_holland_venv_bin: "/openstack/venvs/holland-{{ maas_release }}/bin"
+maas_holland_venv_bin: "/openstack/venvs/holland-{{ rpc_release }}/bin"
 maas_mysql_connection_warning_threshold: 80
 maas_mysql_connection_critical_threshold: 90
 maas_mysql_access_denied_errors_rate_warning_threshold: 10

playbooks/vars/main.yml

@@ -253,3 +253,15 @@ maas_rpc_legacy_ceph: false
 #         to "{{ proxy_env_url }}".
 #
 # maas_proxy_url: http://username:[email protected]:9000/
+
+#
+# maas_holland_enabled: (Optional) Instruct rpc-maas to deploy holland check
+#
+#
+maas_holland_enabled: false
+
+#
+# maas_holland_venv_enabled: Instruct rpc-maas that the holland executable is within a venv
+#                            in the galera containers (RPC-O newton and onward).
+#
+maas_holland_venv_enabled: false