Fix ternary logic for setting holland_venv_bin

Author: Nathan Pawelek

playbooks/maas-infra-galera.yml

@@ -51,7 +51,7 @@
         mode: "0644"
       delegate_to: "{{ physical_host | default(ansible_host) }}"
       when:
-        - maas_holland_venv_enabled | bool
+        - maas_holland_enabled
       notify:
         - Restart rax-maas
 

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

@@ -1,8 +1,6 @@
 {% set label = "holland_local_check" %}
 {% set check_name = label+'--'+inventory_hostname %}
-{% if maas_holland_venv_enabled | bool %}
-{% set holland_venv_bin = (maas_holland_venv_enabled  | bool) | ternary('/openstack/venvs/holland-{{ rpc_release }}/bin','/usr/local/bin') %}
-{% endif %}
+{% 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) }}"

playbooks/vars/maas-infra.yml

@@ -19,6 +19,7 @@ elasticsearch_process_names:
 filebeat_process_names:
   - filebeat
 
+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

@@ -254,6 +254,12 @@ maas_rpc_legacy_ceph: false
 #
 # 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).