diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index a8945b714b..4c0769af2b 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-adjutant-install.yml b/playbooks/os-adjutant-install.yml index fa6954ea3a..7dcae20885 100644 --- a/playbooks/os-adjutant-install.yml +++ b/playbooks/os-adjutant-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 1e9456e16f..9fe0977a03 100644 --- a/playbooks/os-aodh-install.yml +++ b/playbooks/os-aodh-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index 76d4aebbaa..097be2752b 100644 --- a/playbooks/os-barbican-install.yml +++ b/playbooks/os-barbican-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-blazar-install.yml b/playbooks/os-blazar-install.yml index 26104b9adc..38355a9c69 100644 --- a/playbooks/os-blazar-install.yml +++ b/playbooks/os-blazar-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index d9b84e16a0..1a30c3228a 100644 --- a/playbooks/os-cinder-install.yml +++ b/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 diff --git a/playbooks/os-cloudkitty-install.yml b/playbooks/os-cloudkitty-install.yml index 6fe7b25be3..976e90f0f1 100644 --- a/playbooks/os-cloudkitty-install.yml +++ b/playbooks/os-cloudkitty-install.yml @@ -29,7 +29,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 diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index 58f84220df..b897241473 100644 --- a/playbooks/os-designate-install.yml +++ b/playbooks/os-designate-install.yml @@ -31,7 +31,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 diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 1108072dbc..50f9593030 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml index af9cab8099..53db9af304 100644 --- a/playbooks/os-gnocchi-install.yml +++ b/playbooks/os-gnocchi-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index d21f656a52..6344f3ec01 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index db300e93c7..1618cb3398 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index 933f680f87..a85c65ae72 100644 --- a/playbooks/os-ironic-install.yml +++ b/playbooks/os-ironic-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 1f79cc7d84..83edd27db7 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -59,7 +59,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 diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index 58d0280ecf..f2e1886b1c 100644 --- a/playbooks/os-magnum-install.yml +++ b/playbooks/os-magnum-install.yml @@ -31,7 +31,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 diff --git a/playbooks/os-manila-install.yml b/playbooks/os-manila-install.yml index f4a40f6346..5f163db6fe 100644 --- a/playbooks/os-manila-install.yml +++ b/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 diff --git a/playbooks/os-masakari-install.yml b/playbooks/os-masakari-install.yml index d70531cbd0..fa053d7185 100644 --- a/playbooks/os-masakari-install.yml +++ b/playbooks/os-masakari-install.yml @@ -49,7 +49,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 diff --git a/playbooks/os-mistral-install.yml b/playbooks/os-mistral-install.yml index adbe05c7cf..dd032ae2eb 100644 --- a/playbooks/os-mistral-install.yml +++ b/playbooks/os-mistral-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 3b18cc886a..8248ff1291 100644 --- a/playbooks/os-neutron-install.yml +++ b/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 diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index 7f9169aaef..33cad6209d 100644 --- a/playbooks/os-nova-install.yml +++ b/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 diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml index fe3533fddc..48c55e3267 100644 --- a/playbooks/os-octavia-install.yml +++ b/playbooks/os-octavia-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-placement-install.yml b/playbooks/os-placement-install.yml index 2853572960..38a2335037 100644 --- a/playbooks/os-placement-install.yml +++ b/playbooks/os-placement-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-skyline-install.yml b/playbooks/os-skyline-install.yml index cec036aba6..b772653af3 100644 --- a/playbooks/os-skyline-install.yml +++ b/playbooks/os-skyline-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index cd4220b517..e467b0b938 100644 --- a/playbooks/os-swift-install.yml +++ b/playbooks/os-swift-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml index e58ab4e401..4719fd5fc8 100644 --- a/playbooks/os-tacker-install.yml +++ b/playbooks/os-tacker-install.yml @@ -28,7 +28,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 diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index 92665fc573..92a0bc7f5e 100644 --- a/playbooks/os-trove-install.yml +++ b/playbooks/os-trove-install.yml @@ -31,7 +31,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 diff --git a/playbooks/os-zun-install.yml b/playbooks/os-zun-install.yml index 073b02e6fa..a6f618bb1f 100644 --- a/playbooks/os-zun-install.yml +++ b/playbooks/os-zun-install.yml @@ -45,7 +45,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 diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 0ed735d12e..914d9deb3a 100644 --- a/playbooks/rabbitmq-install.yml +++ b/playbooks/rabbitmq-install.yml @@ -74,7 +74,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 diff --git a/playbooks/repo-install.yml b/playbooks/repo-install.yml index 3f00b0ac73..f99fa4b719 100644 --- a/playbooks/repo-install.yml +++ b/playbooks/repo-install.yml @@ -63,7 +63,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