diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index f23a62e149..7b4a272e06 100644 --- a/playbooks/galera-install.yml +++ b/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 diff --git a/playbooks/os-adjutant-install.yml b/playbooks/os-adjutant-install.yml index 2e79de6bf5..739ed86c1e 100644 --- a/playbooks/os-adjutant-install.yml +++ b/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 diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index debf8d9f48..ef6681046f 100644 --- a/playbooks/os-aodh-install.yml +++ b/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 diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index d03ee5bc45..4c7afa5edf 100644 --- a/playbooks/os-barbican-install.yml +++ b/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 diff --git a/playbooks/os-blazar-install.yml b/playbooks/os-blazar-install.yml index 2ff5e66a04..ad09692579 100644 --- a/playbooks/os-blazar-install.yml +++ b/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 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 79d8b57bc3..44c01d80c8 100644 --- a/playbooks/os-cloudkitty-install.yml +++ b/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 diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index 49912d5520..59ed1de657 100644 --- a/playbooks/os-designate-install.yml +++ b/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 diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 7a3772f5ac..0ebdbe9360 100644 --- a/playbooks/os-glance-install.yml +++ b/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 diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml index 64e7b7093c..893f98890a 100644 --- a/playbooks/os-gnocchi-install.yml +++ b/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 diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index 1bdb32720a..7275432ae8 100644 --- a/playbooks/os-heat-install.yml +++ b/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 diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index f1840acc2e..4163e253d3 100644 --- a/playbooks/os-horizon-install.yml +++ b/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 diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index a4645e11a2..f725d6510f 100644 --- a/playbooks/os-ironic-install.yml +++ b/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 diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 7ca2b6da95..27efa14929 100644 --- a/playbooks/os-keystone-install.yml +++ b/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 diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index 3bcb9a0ffc..b89fe2a1b3 100644 --- a/playbooks/os-magnum-install.yml +++ b/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 diff --git a/playbooks/os-manila-install.yml b/playbooks/os-manila-install.yml index 577aeb8083..ac697bd4a5 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 e38556eb7b..d42f5255b9 100644 --- a/playbooks/os-masakari-install.yml +++ b/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 diff --git a/playbooks/os-mistral-install.yml b/playbooks/os-mistral-install.yml index 24c7a3ee42..44dabd1e36 100644 --- a/playbooks/os-mistral-install.yml +++ b/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 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 dc32640ac6..6369ede738 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 5520cc5869..b1b95ac202 100644 --- a/playbooks/os-octavia-install.yml +++ b/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 diff --git a/playbooks/os-placement-install.yml b/playbooks/os-placement-install.yml index 943b806fe2..2bee26b634 100644 --- a/playbooks/os-placement-install.yml +++ b/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 diff --git a/playbooks/os-skyline-install.yml b/playbooks/os-skyline-install.yml index 93c1b177b3..dc3e88a28c 100644 --- a/playbooks/os-skyline-install.yml +++ b/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 diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index 1421e081b3..409daae887 100644 --- a/playbooks/os-swift-install.yml +++ b/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 diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml index b8c73b6eab..693405f762 100644 --- a/playbooks/os-tacker-install.yml +++ b/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 diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index 3c3b017d41..409a457d8d 100644 --- a/playbooks/os-trove-install.yml +++ b/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 diff --git a/playbooks/os-zun-install.yml b/playbooks/os-zun-install.yml index e061215fb2..2cf6c05b72 100644 --- a/playbooks/os-zun-install.yml +++ b/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 diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index 0ffc7e6a5a..a88b48377e 100644 --- a/playbooks/rabbitmq-install.yml +++ b/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 diff --git a/playbooks/repo-install.yml b/playbooks/repo-install.yml index be69173098..1894167b72 100644 --- a/playbooks/repo-install.yml +++ b/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