Merge "Unify haproxy prechecks condition order"

This commit is contained in:
Jenkins 2017-01-30 12:25:12 +00:00 committed by Gerrit Code Review
commit b388f7f9ba

View File

@ -22,8 +22,8 @@
state: stopped state: stopped
when: when:
- enable_aodh | bool - enable_aodh | bool
- "{{ 'aodh_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'aodh_api' not in haproxy_stat }}"
- name: Checking free port for Barbican API HAProxy - name: Checking free port for Barbican API HAProxy
wait_for: wait_for:
@ -33,8 +33,8 @@
state: stopped state: stopped
when: when:
- enable_barbican | bool - enable_barbican | bool
- "{{ 'barbican_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'barbican_api' not in haproxy_stat }}"
- name: Checking free port for Ceilometer API HAProxy - name: Checking free port for Ceilometer API HAProxy
wait_for: wait_for:
@ -44,8 +44,8 @@
state: stopped state: stopped
when: when:
- enable_ceilometer | bool - enable_ceilometer | bool
- "{{ 'ceilometer_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'ceilometer_api' not in haproxy_stat }}"
- name: Checking free port for Cinder API HAProxy - name: Checking free port for Cinder API HAProxy
wait_for: wait_for:
@ -55,8 +55,8 @@
state: stopped state: stopped
when: when:
- enable_cinder | bool - enable_cinder | bool
- "{{ 'cinder_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'cinder_api' not in haproxy_stat }}"
- name: Checking free port for Cloudkitty API HAProxy - name: Checking free port for Cloudkitty API HAProxy
wait_for: wait_for:
@ -66,8 +66,8 @@
state: stopped state: stopped
when: when:
- enable_cloudkitty | bool - enable_cloudkitty | bool
- "{{ 'cloudkitty_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'cloudkitty_api' not in haproxy_stat }}"
- name: Checking free port for Congress API HAProxy - name: Checking free port for Congress API HAProxy
wait_for: wait_for:
@ -77,8 +77,8 @@
state: stopped state: stopped
when: when:
- enable_congress | bool - enable_congress | bool
- "{{ 'congress_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'congress_api' not in haproxy_stat }}"
- name: Checking free port for Designate API HAProxy - name: Checking free port for Designate API HAProxy
wait_for: wait_for:
@ -99,8 +99,8 @@
state: stopped state: stopped
when: when:
- enable_elasticsearch | bool - enable_elasticsearch | bool
- "{{ 'elasticsearch' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'elasticsearch' not in haproxy_stat }}"
- name: Checking free port for Glance API HAProxy - name: Checking free port for Glance API HAProxy
wait_for: wait_for:
@ -132,8 +132,8 @@
state: stopped state: stopped
when: when:
- enable_gnocchi | bool - enable_gnocchi | bool
- "{{ 'gnocchi_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'gnocchi_api' not in haproxy_stat }}"
- name: Checking free port for Freezer API HAProxy - name: Checking free port for Freezer API HAProxy
wait_for: wait_for:
@ -154,8 +154,8 @@
state: stopped state: stopped
when: when:
- enable_grafana | bool - enable_grafana | bool
- "{{ 'grafana_server' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'grafana_server' not in haproxy_stat }}"
- name: Checking free port for Heat API HAProxy - name: Checking free port for Heat API HAProxy
wait_for: wait_for:
@ -165,8 +165,8 @@
state: stopped state: stopped
when: when:
- enable_heat | bool - enable_heat | bool
- "{{ 'heat_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'heat_api' not in haproxy_stat }}"
- name: Checking free port for Heat API CFN HAProxy - name: Checking free port for Heat API CFN HAProxy
wait_for: wait_for:
@ -176,8 +176,8 @@
state: stopped state: stopped
when: when:
- enable_heat | bool - enable_heat | bool
- "{{ 'heat_api_cfn' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'heat_api_cfn' not in haproxy_stat }}"
- name: Checking free port for Horizon HAProxy - name: Checking free port for Horizon HAProxy
wait_for: wait_for:
@ -187,8 +187,8 @@
state: stopped state: stopped
when: when:
- enable_horizon | bool - enable_horizon | bool
- "{{ 'horizon' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'horizon' not in haproxy_stat }}"
- name: Checking free port for Ironic HAProxy - name: Checking free port for Ironic HAProxy
wait_for: wait_for:
@ -198,40 +198,8 @@
state: stopped state: stopped
when: when:
- enable_ironic | bool - enable_ironic | bool
- inventory_hostname in groups['haproxy']
- "{{ 'ironic_api' not in haproxy_stat }}" - "{{ 'ironic_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Keystone Admin HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ keystone_admin_port }}"
connect_timeout: 1
state: stopped
when:
- enable_keystone | bool
- "{{ 'keystone_admin' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Keystone Internal HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ keystone_public_port }}"
connect_timeout: 1
state: stopped
when:
- enable_keystone | bool
- "{{ 'keystone_internal' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy']
- name: Checking free port for Keystone Public HAProxy
wait_for:
host: "{{ kolla_external_vip_address }}"
port: "{{ keystone_public_port }}"
connect_timeout: 1
state: stopped
when:
- enable_keystone | bool
- "{{ 'keystone_external' not in haproxy_stat }}"
- name: Checking free port for Karbor Admin HAProxy - name: Checking free port for Karbor Admin HAProxy
wait_for: wait_for:
@ -241,8 +209,41 @@
state: stopped state: stopped
when: when:
- enable_karbor | bool - enable_karbor | bool
- "{{ 'karbor_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'karbor_api' not in haproxy_stat }}"
- name: Checking free port for Keystone Admin HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ keystone_admin_port }}"
connect_timeout: 1
state: stopped
when:
- enable_keystone | bool
- inventory_hostname in groups['haproxy']
- "{{ 'keystone_admin' not in haproxy_stat }}"
- name: Checking free port for Keystone Internal HAProxy
wait_for:
host: "{{ kolla_internal_vip_address }}"
port: "{{ keystone_public_port }}"
connect_timeout: 1
state: stopped
when:
- enable_keystone | bool
- inventory_hostname in groups['haproxy']
- "{{ 'keystone_internal' not in haproxy_stat }}"
- name: Checking free port for Keystone Public HAProxy
wait_for:
host: "{{ kolla_external_vip_address }}"
port: "{{ keystone_public_port }}"
connect_timeout: 1
state: stopped
when:
- enable_keystone | bool
- inventory_hostname in groups['haproxy']
- "{{ 'keystone_external' not in haproxy_stat }}"
- name: Checking free port for Kibana HAProxy - name: Checking free port for Kibana HAProxy
wait_for: wait_for:
@ -252,8 +253,8 @@
state: stopped state: stopped
when: when:
- enable_kibana | bool - enable_kibana | bool
- "{{ 'kibana' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'kibana' not in haproxy_stat }}"
- name: Checking free port for Magnum API HAProxy - name: Checking free port for Magnum API HAProxy
wait_for: wait_for:
@ -263,8 +264,8 @@
state: stopped state: stopped
when: when:
- enable_magnum | bool - enable_magnum | bool
- "{{ 'magnum_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'magnum_api' not in haproxy_stat }}"
- name: Checking free port for Manila API HAProxy - name: Checking free port for Manila API HAProxy
wait_for: wait_for:
@ -274,8 +275,8 @@
state: stopped state: stopped
when: when:
- enable_manila | bool - enable_manila | bool
- "{{ 'manila_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'manila_api' not in haproxy_stat }}"
- name: Checking free port for MariaDB HAProxy - name: Checking free port for MariaDB HAProxy
wait_for: wait_for:
@ -285,8 +286,8 @@
state: stopped state: stopped
when: when:
- enable_mariadb | bool - enable_mariadb | bool
- "{{ 'mariadb' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'mariadb' not in haproxy_stat }}"
- name: Checking free port for Mistral API HAProxy - name: Checking free port for Mistral API HAProxy
wait_for: wait_for:
@ -296,8 +297,8 @@
state: stopped state: stopped
when: when:
- enable_mistral | bool - enable_mistral | bool
- "{{ 'mistral_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'mistral_api' not in haproxy_stat }}"
- name: Checking free port for Mongodb HAProxy - name: Checking free port for Mongodb HAProxy
wait_for: wait_for:
@ -307,8 +308,8 @@
state: stopped state: stopped
when: when:
- enable_mongodb | bool - enable_mongodb | bool
- "{{ 'mongodb' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'mongodb' not in haproxy_stat }}"
- name: Checking free port for Murano API HAProxy - name: Checking free port for Murano API HAProxy
wait_for: wait_for:
@ -318,8 +319,8 @@
state: stopped state: stopped
when: when:
- enable_murano | bool - enable_murano | bool
- "{{ 'murano_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'murano_api' not in haproxy_stat }}"
- name: Checking free port for Neutron Server HAProxy - name: Checking free port for Neutron Server HAProxy
wait_for: wait_for:
@ -329,8 +330,8 @@
state: stopped state: stopped
when: when:
- enable_neutron | bool - enable_neutron | bool
- "{{ 'neutron_server' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'neutron_server' not in haproxy_stat }}"
- name: Checking free port for Nova API HAProxy - name: Checking free port for Nova API HAProxy
wait_for: wait_for:
@ -340,8 +341,8 @@
state: stopped state: stopped
when: when:
- enable_nova | bool - enable_nova | bool
- "{{ 'nova_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'nova_api' not in haproxy_stat }}"
- name: Checking free port for Nova Metadata HAProxy - name: Checking free port for Nova Metadata HAProxy
wait_for: wait_for:
@ -351,8 +352,8 @@
state: stopped state: stopped
when: when:
- enable_nova | bool - enable_nova | bool
- "{{ 'nova_metadata' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'nova_metadata' not in haproxy_stat }}"
- name: Checking free port for Nova NoVNC HAProxy - name: Checking free port for Nova NoVNC HAProxy
wait_for: wait_for:
@ -362,9 +363,9 @@
state: stopped state: stopped
when: when:
- enable_nova | bool - enable_nova | bool
- "{{ 'nova_novncproxy' not in haproxy_stat }}"
- nova_console == 'novnc' - nova_console == 'novnc'
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'nova_novncproxy' not in haproxy_stat }}"
- name: Checking free port for Nova Serial Proxy HAProxy - name: Checking free port for Nova Serial Proxy HAProxy
wait_for: wait_for:
@ -386,9 +387,9 @@
state: stopped state: stopped
when: when:
- enable_nova | bool - enable_nova | bool
- "{{ 'nova_spicehtml5proxy' not in haproxy_stat }}"
- nova_console == 'spice' - nova_console == 'spice'
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'nova_spicehtml5proxy' not in haproxy_stat }}"
- name: Checking free port for Octavia API HAProxy - name: Checking free port for Octavia API HAProxy
wait_for: wait_for:
@ -398,8 +399,8 @@
state: stopped state: stopped
when: when:
- enable_octavia | bool - enable_octavia | bool
- "{{ 'octavia_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'octavia_api' not in haproxy_stat }}"
- name: Checking free port for Panko API HAProxy - name: Checking free port for Panko API HAProxy
wait_for: wait_for:
@ -409,8 +410,8 @@
state: stopped state: stopped
when: when:
- enable_panko | bool - enable_panko | bool
- "{{ 'panko_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'panko_api' not in haproxy_stat }}"
- name: Checking free port for RabbitMQ Management HAProxy - name: Checking free port for RabbitMQ Management HAProxy
wait_for: wait_for:
@ -420,8 +421,8 @@
state: stopped state: stopped
when: when:
- enable_rabbitmq | bool - enable_rabbitmq | bool
- "{{ 'rabbitmq_management' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'rabbitmq_management' not in haproxy_stat }}"
- name: Checking free port for RadosGW HAProxy - name: Checking free port for RadosGW HAProxy
wait_for: wait_for:
@ -431,8 +432,8 @@
state: stopped state: stopped
when: when:
- enable_ceph_rgw | bool - enable_ceph_rgw | bool
- "{{ 'radosgw' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'radosgw' not in haproxy_stat }}"
- name: Checking free port for Sahara API HAProxy - name: Checking free port for Sahara API HAProxy
wait_for: wait_for:
@ -442,8 +443,8 @@
state: stopped state: stopped
when: when:
- enable_sahara | bool - enable_sahara | bool
- "{{ 'sahara_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'sahara_api' not in haproxy_stat }}"
- name: Checking free port for Searchlight API HAProxy - name: Checking free port for Searchlight API HAProxy
wait_for: wait_for:
@ -453,8 +454,8 @@
state: stopped state: stopped
when: when:
- enable_searchlight | bool - enable_searchlight | bool
- "{{ 'searchlight_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'searchlight_api' not in haproxy_stat }}"
- name: Checking free port for Senlin API HAProxy - name: Checking free port for Senlin API HAProxy
wait_for: wait_for:
@ -464,8 +465,8 @@
state: stopped state: stopped
when: when:
- enable_senlin | bool - enable_senlin | bool
- "{{ 'senlin_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'senlin_api' not in haproxy_stat }}"
- name: Checking free port for Solum Application Deployment HAProxy - name: Checking free port for Solum Application Deployment HAProxy
wait_for: wait_for:
@ -475,8 +476,8 @@
state: stopped state: stopped
when: when:
- enable_solum | bool - enable_solum | bool
- "{{ 'solum_application_deployment' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'solum_application_deployment' not in haproxy_stat }}"
- name: Checking free port for Solum Image Builder HAProxy - name: Checking free port for Solum Image Builder HAProxy
wait_for: wait_for:
@ -486,6 +487,7 @@
state: stopped state: stopped
when: when:
- enable_solum | bool - enable_solum | bool
- inventory_hostname in groups['haproxy']
- "{{ 'solum_image_builder' not in haproxy_stat }}" - "{{ 'solum_image_builder' not in haproxy_stat }}"
- name: Checking free port for Swift Proxy Server HAProxy - name: Checking free port for Swift Proxy Server HAProxy
@ -496,8 +498,8 @@
state: stopped state: stopped
when: when:
- enable_swift | bool - enable_swift | bool
- "{{ 'swift_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'swift_api' not in haproxy_stat }}"
- name: Checking free port for Tacker Server HAProxy - name: Checking free port for Tacker Server HAProxy
wait_for: wait_for:
@ -507,8 +509,8 @@
state: stopped state: stopped
when: when:
- enable_tacker | bool - enable_tacker | bool
- "{{ 'tacker_server' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'tacker_server' not in haproxy_stat }}"
- name: Checking free port for Trove API HAProxy - name: Checking free port for Trove API HAProxy
wait_for: wait_for:
@ -518,8 +520,8 @@
state: stopped state: stopped
when: when:
- enable_trove | bool - enable_trove | bool
- "{{ 'trove_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'trove_api' not in haproxy_stat }}"
- name: Checking free port for Watcher API HAProxy - name: Checking free port for Watcher API HAProxy
wait_for: wait_for:
@ -529,5 +531,5 @@
state: stopped state: stopped
when: when:
- enable_watcher | bool - enable_watcher | bool
- "{{ 'watcher_api' not in haproxy_stat }}"
- inventory_hostname in groups['haproxy'] - inventory_hostname in groups['haproxy']
- "{{ 'watcher_api' not in haproxy_stat }}"