Merge "Skip importing haproxy_service_config with no haproxy hosts"

playbooks/galera-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: galera_all
     service_variable: "galera_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-adjutant-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: adjutant_api
     service_variable: "adjutant_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-aodh-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: aodh_api
     service_variable: "aodh_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-barbican-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: barbican_api
     service_variable: "barbican_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-blazar-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: blazar_api
     service_variable: "blazar_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-cinder-install.yml

@@ -55,7 +55,9 @@
   vars:
     service_group: cinder_api
     service_variable: "cinder_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-cloudkitty-install.yml

@@ -30,7 +30,9 @@
   vars:
     service_group: cloudkitty_api
     service_variable: "cloudkitty_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-designate-install.yml

@@ -32,7 +32,9 @@
   vars:
     service_group: designate_api
     service_variable: "designate_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-glance-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: glance_api
     service_variable: "glance_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-gnocchi-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: gnocchi_api
     service_variable: "gnocchi_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-heat-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: heat_api
     service_variable: "heat_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-horizon-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: horizon_all
     service_variable: "horizon_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-ironic-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: ironic_api
     service_variable: "ironic_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-keystone-install.yml

@@ -65,7 +65,9 @@
   vars:
     service_group: keystone_all
     service_variable: "keystone_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-magnum-install.yml

@@ -32,7 +32,9 @@
   vars:
     service_group: magnum_all
     service_variable: "magnum_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-manila-install.yml

@@ -28,7 +28,9 @@
   vars:
     service_group: manila_api
     service_variable: "manila_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-masakari-install.yml

@@ -50,7 +50,9 @@
   vars:
     service_group: masakari_api
     service_variable: "masakari_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-mistral-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: mistral_api
     service_variable: "mistral_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-neutron-install.yml

@@ -53,7 +53,9 @@
   vars:
     service_group: neutron_server
     service_variable: "neutron_haproxy_services"
-  when: groups[service_group]
+  when:
+    - groups[service_group]
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-nova-install.yml

@@ -41,7 +41,9 @@
       - nova_console
       - nova_ironic_console
     service_variable: "nova_haproxy_services"
-  when: groups['nova_all'] | length > 0
+  when:
+    - groups['nova_all'] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-octavia-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: octavia-api
     service_variable: "octavia_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-placement-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: placement_api
     service_variable: "placement_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-skyline-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: skyline_all
     service_variable: "skyline_haproxy_services"
-  when: groups[service_group]
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-swift-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: swift_all
     service_variable: "swift_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-tacker-install.yml

@@ -29,7 +29,9 @@
   vars:
     service_group: tacker_server
     service_variable: "tacker_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-trove-install.yml

@@ -32,7 +32,9 @@
   vars:
     service_group: trove_api
     service_variable: "trove_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/os-zun-install.yml

@@ -46,7 +46,9 @@
   vars:
     service_group: zun_api
     service_variable: "zun_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/rabbitmq-install.yml

@@ -75,7 +75,9 @@
   vars:
     service_group: rabbitmq_all
     service_variable: "rabbitmq_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config
 

playbooks/repo-install.yml

@@ -64,7 +64,9 @@
   vars:
     service_group: repo_all
     service_variable: "repo_haproxy_services"
-  when: groups[service_group] | length > 0
+  when:
+    - groups[service_group] | length > 0
+    - groups['haproxy'] | length > 0
   tags:
     - haproxy-service-config