fix accessing enable_haproxy

Change-Id: I34ec438bcd27e790ea34b5206041cc0339dfcc25 Partial-Bug: #1770841
Juniper · Jun 6, 2018 · a0ae4fb · a0ae4fb
1 parent 56cda88
commit a0ae4fb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/playbooks/roles/install_contrail/tasks/main.yml b/playbooks/roles/install_contrail/tasks/main.yml
@@ -145,6 +145,7 @@
     openstack_internal_vip: "{{ openstack_nodes_list | first }}"
   when:
     - contrail_configuration.CLOUD_ORCHESTRATOR == 'openstack'
+    - kolla_config.kolla_globals.enable_haproxy is defined
     - not (kolla_config.kolla_globals.enable_haproxy | bool)
   tags:
    - always
@@ -153,7 +154,7 @@
     openstack_internal_vip: "{{ kolla_config.kolla_globals.kolla_internal_vip_address }}"
   when:
     - contrail_configuration.CLOUD_ORCHESTRATOR == 'openstack'
-    - kolla_config.kolla_globals.enable_haproxy | bool
+    - kolla_config.kolla_globals.enable_haproxy is not defined or (kolla_config.kolla_globals.enable_haproxy | bool)
   tags:
    - always