From e2373199659422adbf47d23e2eb1c89b6b579f74 Mon Sep 17 00:00:00 2001 From: Ethan Lynn Date: Thu, 8 Dec 2016 17:59:48 +0800 Subject: [PATCH] Always check enable_* variables first Check enable_* variables first, then check inventory_host in group, will help to avoid configuration errors. Change-Id: Icdb1f50e5c911203b92ac431723620756b15f3c6 Closes-Bug: #1648376 --- ansible/roles/ceph/tasks/deploy.yml | 2 +- ansible/roles/ceph/tasks/reconfigure.yml | 4 +- ansible/roles/ceph/tasks/upgrade.yml | 2 +- ansible/roles/iscsi/tasks/config.yml | 4 +- ansible/roles/neutron/tasks/deploy.yml | 2 +- ansible/roles/neutron/tasks/pull.yml | 2 +- ansible/roles/nova/tasks/pull.yml | 4 +- ansible/roles/nova/tasks/start_compute.yml | 6 +- ansible/roles/prechecks/tasks/port_checks.yml | 170 +++++++++--------- .../roles/prechecks/tasks/service_checks.yml | 2 +- 10 files changed, 99 insertions(+), 99 deletions(-) diff --git a/ansible/roles/ceph/tasks/deploy.yml b/ansible/roles/ceph/tasks/deploy.yml index 403265af74..d3a8cb6bca 100644 --- a/ansible/roles/ceph/tasks/deploy.yml +++ b/ansible/roles/ceph/tasks/deploy.yml @@ -17,5 +17,5 @@ - include: start_rgws.yml when: - - inventory_hostname in groups['ceph-rgw'] - enable_ceph_rgw | bool + - inventory_hostname in groups['ceph-rgw'] diff --git a/ansible/roles/ceph/tasks/reconfigure.yml b/ansible/roles/ceph/tasks/reconfigure.yml index ee7a78779f..b2c6092df1 100644 --- a/ansible/roles/ceph/tasks/reconfigure.yml +++ b/ansible/roles/ceph/tasks/reconfigure.yml @@ -77,8 +77,8 @@ failed_when: false register: ceph_rgw_check_results when: - - inventory_hostname in groups[item.group] - enable_ceph_rgw | bool + - inventory_hostname in groups[item.group] with_items: - { name: ceph_rgw, group: ceph-rgw} @@ -107,8 +107,8 @@ action: "get_container_env" register: ceph_rgw_container_envs when: - - inventory_hostname in groups[item.group] - enable_ceph_rgw | bool + - inventory_hostname in groups[item.group] with_items: - { name: ceph_rgw, group: ceph-rgw } diff --git a/ansible/roles/ceph/tasks/upgrade.yml b/ansible/roles/ceph/tasks/upgrade.yml index bf1c4ffde6..52f76c05b8 100644 --- a/ansible/roles/ceph/tasks/upgrade.yml +++ b/ansible/roles/ceph/tasks/upgrade.yml @@ -9,5 +9,5 @@ - include: start_rgws.yml when: - - inventory_hostname in groups['ceph-rgw'] - enable_ceph_rgw | bool + - inventory_hostname in groups['ceph-rgw'] diff --git a/ansible/roles/iscsi/tasks/config.yml b/ansible/roles/iscsi/tasks/config.yml index 0ebe3dd745..fefa3f15e0 100644 --- a/ansible/roles/iscsi/tasks/config.yml +++ b/ansible/roles/iscsi/tasks/config.yml @@ -24,8 +24,8 @@ state: "directory" recurse: yes when: - - inventory_hostname in groups['tgtd'] - enable_cinder_backend_lvm | bool + - inventory_hostname in groups['tgtd'] with_items: - "tgtd" @@ -34,7 +34,7 @@ src: "{{ item }}.json.j2" dest: "{{ node_config_directory }}/{{ item }}/config.json" when: - - inventory_hostname in groups['tgtd'] - enable_cinder_backend_lvm | bool + - inventory_hostname in groups['tgtd'] with_items: - "tgtd" diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml index 7a75bdb204..7274697135 100644 --- a/ansible/roles/neutron/tasks/deploy.yml +++ b/ansible/roles/neutron/tasks/deploy.yml @@ -17,8 +17,8 @@ - include: config-neutron-fake.yml when: - - inventory_hostname in groups['compute'] - enable_nova_fake | bool + - inventory_hostname in groups['compute'] - include: bootstrap.yml when: inventory_hostname in groups['neutron-server'] diff --git a/ansible/roles/neutron/tasks/pull.yml b/ansible/roles/neutron/tasks/pull.yml index 11c4d92164..620ff60415 100644 --- a/ansible/roles/neutron/tasks/pull.yml +++ b/ansible/roles/neutron/tasks/pull.yml @@ -54,8 +54,8 @@ common_options: "{{ docker_common_options }}" image: "{{ neutron_vpnaas_agent_image_full }}" when: - - inventory_hostname in groups['neutron-vpnaas-agent'] - enable_neutron_vpnaas | bool + - inventory_hostname in groups['neutron-vpnaas-agent'] - name: Pulling neutron-server image kolla_docker: diff --git a/ansible/roles/nova/tasks/pull.yml b/ansible/roles/nova/tasks/pull.yml index 6d067ab7e4..ec5f6af936 100644 --- a/ansible/roles/nova/tasks/pull.yml +++ b/ansible/roles/nova/tasks/pull.yml @@ -12,8 +12,8 @@ common_options: "{{ docker_common_options }}" image: "{{ nova_compute_image_full }}" when: - - inventory_hostname in groups['compute'] - not enable_nova_fake | bool + - inventory_hostname in groups['compute'] - name: Pulling nova-compute-ironic image kolla_docker: @@ -21,8 +21,8 @@ common_options: "{{ docker_common_options }}" image: "{{ nova_compute_ironic_image_full }}" when: - - inventory_hostname in groups['nova-compute-ironic'] - enable_ironic | bool + - inventory_hostname in groups['nova-compute-ironic'] - name: Pulling nova-conductor image kolla_docker: diff --git a/ansible/roles/nova/tasks/start_compute.yml b/ansible/roles/nova/tasks/start_compute.yml index d40e7a007c..87c5044905 100644 --- a/ansible/roles/nova/tasks/start_compute.yml +++ b/ansible/roles/nova/tasks/start_compute.yml @@ -49,9 +49,9 @@ privileged: True volumes: '{{ mounts | reject("equalto", "") | list}}' when: - - inventory_hostname in groups['compute'] - not enable_nova_fake | bool - not enable_ironic | bool + - inventory_hostname in groups['compute'] - name: Starting nova-compute-ironic container kolla_docker: @@ -64,8 +64,8 @@ - "/etc/localtime:/etc/localtime:ro" - "kolla_logs:/var/log/kolla/" when: - - inventory_hostname in groups['nova-compute-ironic'] - enable_ironic | bool + - inventory_hostname in groups['nova-compute-ironic'] - name: Starting nova-compute-fake containers kolla_docker: @@ -82,8 +82,8 @@ - "kolla_logs:/var/log/kolla/" with_sequence: start=1 end={{ num_nova_fake_per_node }} when: - - inventory_hostname in groups['compute'] - enable_nova_fake | bool + - inventory_hostname in groups['compute'] - name: Starting nova-ssh container kolla_docker: diff --git a/ansible/roles/prechecks/tasks/port_checks.yml b/ansible/roles/prechecks/tasks/port_checks.yml index dc7dfa1159..475fd73abb 100644 --- a/ansible/roles/prechecks/tasks/port_checks.yml +++ b/ansible/roles/prechecks/tasks/port_checks.yml @@ -40,8 +40,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['aodh-api'] - enable_aodh | bool + - inventory_hostname in groups['aodh-api'] - name: Checking free port for Aodh API HAProxy wait_for: @@ -50,8 +50,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_aodh | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Barbican API wait_for: @@ -60,8 +60,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['barbican-api'] - enable_barbican | bool + - inventory_hostname in groups['barbican-api'] - name: Checking free port for Barbican API HAProxy wait_for: @@ -70,8 +70,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_barbican | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Ceilometer API wait_for: @@ -80,8 +80,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['ceilometer-api'] - enable_ceilometer | bool + - inventory_hostname in groups['ceilometer-api'] - name: Checking free port for Ceilometer API HAProxy wait_for: @@ -90,8 +90,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_ceilometer | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Congress API wait_for: @@ -100,8 +100,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['congress-api'] - enable_congress | bool + - inventory_hostname in groups['congress-api'] - name: Checking free port for Congress API HAProxy wait_for: @@ -110,8 +110,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_congress | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Cinder API wait_for: @@ -120,8 +120,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['cinder-api'] - enable_cinder | bool + - inventory_hostname in groups['cinder-api'] - name: Checking free port for Cinder API HAProxy wait_for: @@ -130,8 +130,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_cinder | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Cloudkitty API wait_for: @@ -140,8 +140,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['cloudkitty-api'] - enable_cloudkitty | bool + - inventory_hostname in groups['cloudkitty-api'] - name: Checking free port for Cloudkitty API HAProxy wait_for: @@ -150,8 +150,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_cloudkitty | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Etcd Peer wait_for: @@ -160,8 +160,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['etcd'] - enable_etcd | bool + - inventory_hostname in groups['etcd'] - name: Checking free port for Etcd Client wait_for: @@ -170,8 +170,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['etcd'] - enable_etcd | bool + - inventory_hostname in groups['etcd'] - name: Checking free port for Gnocchi API wait_for: @@ -180,8 +180,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['gnocchi-api'] - enable_gnocchi | bool + - inventory_hostname in groups['gnocchi-api'] - name: Checking free port for Gnocchi API HAProxy wait_for: @@ -190,8 +190,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_gnocchi | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Kuryr wait_for: @@ -200,8 +200,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['compute'] - enable_kuryr | bool + - inventory_hostname in groups['compute'] - name: Checking free port for Sahara API wait_for: @@ -210,8 +210,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['sahara-api'] - enable_sahara | bool + - inventory_hostname in groups['sahara-api'] - name: Checking free port for Sahara API HAProxy wait_for: @@ -220,8 +220,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_sahara | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for HAProxy stats wait_for: @@ -230,8 +230,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_haproxy | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Heat API wait_for: @@ -240,8 +240,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['heat-api'] - enable_heat | bool + - inventory_hostname in groups['heat-api'] - name: Checking free port for Heat API HAProxy wait_for: @@ -250,8 +250,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_heat | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Heat API CFN wait_for: @@ -260,8 +260,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['heat-api-cfn'] - enable_heat | bool + - inventory_hostname in groups['heat-api-cfn'] - name: Checking free port for Heat API CFN HAProxy wait_for: @@ -270,8 +270,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_heat | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Horizon wait_for: @@ -280,8 +280,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['horizon'] - enable_horizon | bool + - inventory_hostname in groups['horizon'] - name: Checking free port for Horizon HAProxy wait_for: @@ -290,8 +290,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_horizon | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Ironic wait_for: @@ -300,8 +300,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['ironic-api'] - enable_ironic | bool + - inventory_hostname in groups['ironic-api'] - name: Checking free port for Ironic HAProxy wait_for: @@ -310,8 +310,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_ironic | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Influxdb Admin wait_for: @@ -320,8 +320,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['influxdb'] - enable_influxdb | bool + - inventory_hostname in groups['influxdb'] - name: Checking free port for Influxdb Http wait_for: @@ -330,8 +330,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['influxdb'] - enable_influxdb | bool + - inventory_hostname in groups['influxdb'] - name: Checking free port for Keystone Admin wait_for: @@ -340,8 +340,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['keystone'] - enable_keystone | bool + - inventory_hostname in groups['keystone'] - name: Checking free port for Keystone Admin HAProxy wait_for: @@ -350,8 +350,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_keystone | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Keystone Public wait_for: @@ -360,8 +360,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['keystone'] - enable_keystone | bool + - inventory_hostname in groups['keystone'] - name: Checking free port for Keystone Public HAProxy wait_for: @@ -370,8 +370,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_keystone | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for iscsi wait_for: @@ -380,8 +380,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['tgtd'] - enable_iscsid | bool + - inventory_hostname in groups['tgtd'] - name: Checking free port for Magnum API wait_for: @@ -390,8 +390,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['magnum-api'] - enable_magnum | bool + - inventory_hostname in groups['magnum-api'] - name: Checking free port for Magnum API HAProxy wait_for: @@ -400,8 +400,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_magnum | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for MariaDB wait_for: @@ -410,8 +410,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['mariadb'] - enable_mariadb | bool + - inventory_hostname in groups['mariadb'] - name: Checking free port for MariaDB HAProxy wait_for: @@ -420,8 +420,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_mariadb | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for MariaDB WSREP wait_for: @@ -430,8 +430,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['mariadb'] - enable_mariadb | bool + - inventory_hostname in groups['mariadb'] - name: Checking free port for MariaDB IST wait_for: @@ -440,8 +440,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['mariadb'] - enable_mariadb | bool + - inventory_hostname in groups['mariadb'] - name: Checking free port for MariaDB SST wait_for: @@ -450,8 +450,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['mariadb'] - enable_mariadb | bool + - inventory_hostname in groups['mariadb'] - name: Checking free port for Manila API wait_for: @@ -460,8 +460,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['manila-api'] - enable_manila | bool + - inventory_hostname in groups['manila-api'] - name: Checking free port for Manila API HAProxy wait_for: @@ -470,8 +470,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_manila | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Memcached wait_for: @@ -480,8 +480,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['memcached'] - enable_memcached | bool + - inventory_hostname in groups['memcached'] - name: Checking free port for Murano API wait_for: @@ -490,8 +490,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['murano-api'] - enable_murano | bool + - inventory_hostname in groups['murano-api'] - name: Checking free port for Murano API HAProxy wait_for: @@ -500,8 +500,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_murano | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Neutron Server wait_for: @@ -510,8 +510,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['neutron-server'] - enable_neutron | bool + - inventory_hostname in groups['neutron-server'] - name: Checking free port for Neutron Server HAProxy wait_for: @@ -520,8 +520,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_neutron | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Nova API wait_for: @@ -530,8 +530,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['nova-api'] - enable_nova | bool + - inventory_hostname in groups['nova-api'] - name: Checking free port for Nova API HAProxy wait_for: @@ -540,8 +540,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_nova | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Nova Metadata wait_for: @@ -550,8 +550,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['nova-api'] - enable_nova | bool + - inventory_hostname in groups['nova-api'] - name: Checking free port for Nova Metadata HAProxy wait_for: @@ -560,8 +560,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_nova | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Nova NoVNC Proxy wait_for: @@ -570,9 +570,9 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['nova-novncproxy'] - enable_nova | bool - nova_console == 'novnc' + - inventory_hostname in groups['nova-novncproxy'] - name: Checking free port for Nova NoVNC HAProxy wait_for: @@ -581,9 +581,9 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_nova | bool - nova_console == 'novnc' + - inventory_hostname in groups['haproxy'] - name: Checking free port for Nova Spice HTML5 Proxy wait_for: @@ -592,9 +592,9 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['nova-spicehtml5proxy'] - enable_nova | bool - nova_console == 'spice' + - inventory_hostname in groups['nova-spicehtml5proxy'] - name: Checking free port for Nova Spice HTML5 HAProxy wait_for: @@ -603,9 +603,9 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_nova | bool - nova_console == 'spice' + - inventory_hostname in groups['haproxy'] - name: Checking free port for RabbitMQ wait_for: @@ -614,8 +614,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['rabbitmq'] - enable_rabbitmq | bool + - inventory_hostname in groups['rabbitmq'] - name: Checking free port for RabbitMQ Management wait_for: @@ -624,8 +624,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['rabbitmq'] - enable_rabbitmq | bool + - inventory_hostname in groups['rabbitmq'] - name: Checking free port for RabbitMQ Management HAProxy wait_for: @@ -634,8 +634,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_rabbitmq | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for RabbitMQ Cluster wait_for: @@ -644,8 +644,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['rabbitmq'] - enable_rabbitmq | bool + - inventory_hostname in groups['rabbitmq'] - name: Checking free port for RabbitMQ EPMD wait_for: @@ -654,8 +654,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['rabbitmq'] - enable_rabbitmq | bool + - inventory_hostname in groups['rabbitmq'] - name: Check if all rabbit hostnames are resolvable command: "getent ahostsv4 {{ hostvars[item]['ansible_hostname'] }}" @@ -727,8 +727,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['solum-api'] - enable_solum | bool + - inventory_hostname in groups['solum-api'] - name: Checking free port for Solum Image Builder wait_for: @@ -737,8 +737,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['solum-api'] - enable_solum | bool + - inventory_hostname in groups['solum-api'] - name: Checking free port for Solum Application Deployment HAProxy wait_for: @@ -747,8 +747,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_solum | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Solum Image Builder HAProxy wait_for: @@ -757,8 +757,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_solum | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Swift Object Server wait_for: @@ -767,8 +767,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['swift-object-server'] - enable_swift | bool + - inventory_hostname in groups['swift-object-server'] - name: Checking free port for Swift Account Server wait_for: @@ -777,8 +777,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['swift-account-server'] - enable_swift | bool + - inventory_hostname in groups['swift-account-server'] - name: Checking free port for Swift Container Server wait_for: @@ -787,8 +787,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['swift-container-server'] - enable_swift | bool + - inventory_hostname in groups['swift-container-server'] - name: Checking free port for Swift Proxy Server wait_for: @@ -797,8 +797,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['swift-proxy-server'] - enable_swift | bool + - inventory_hostname in groups['swift-proxy-server'] - name: Checking free port for Swift Proxy Server HAProxy wait_for: @@ -807,8 +807,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_swift | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for RadosGW wait_for: @@ -817,8 +817,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['ceph-rgw'] - enable_ceph_rgw | bool + - inventory_hostname in groups['ceph-rgw'] - name: Checking free port for RadosGW HAProxy wait_for: @@ -827,8 +827,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_ceph_rgw | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Grafana server wait_for: @@ -837,8 +837,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['grafana'] - enable_grafana | bool + - inventory_hostname in groups['grafana'] - name: Checking free port for Grafana server HAProxy wait_for: @@ -847,8 +847,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_grafana | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Senlin API wait_for: @@ -857,8 +857,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['senlin-api'] - enable_senlin | bool + - inventory_hostname in groups['senlin-api'] - name: Checking free port for Senlin API HAProxy wait_for: @@ -867,8 +867,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_senlin | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Mistral API wait_for: @@ -877,8 +877,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['mistral-api'] - enable_mistral | bool + - inventory_hostname in groups['mistral-api'] - name: Checking free port for Mistral API HAProxy wait_for: @@ -887,8 +887,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_mistral | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Watcher API wait_for: @@ -897,8 +897,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['watcher-api'] - enable_watcher | bool + - inventory_hostname in groups['watcher-api'] - name: Checking free port for Watcher API HAProxy wait_for: @@ -907,8 +907,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_watcher | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Searchlight API wait_for: @@ -917,8 +917,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['searchlight-api'] - enable_searchlight | bool + - inventory_hostname in groups['searchlight-api'] - name: Checking free port for Searchlight API HAProxy wait_for: @@ -927,8 +927,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_searchlight | bool + - inventory_hostname in groups['haproxy'] - name: Checking free port for Tacker Server wait_for: @@ -937,8 +937,8 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['tacker'] - enable_tacker | bool + - inventory_hostname in groups['tacker'] - name: Checking free port for Tacker Server HAProxy wait_for: @@ -947,5 +947,5 @@ connect_timeout: 1 state: stopped when: - - inventory_hostname in groups['haproxy'] - enable_tacker | bool + - inventory_hostname in groups['haproxy'] diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml index 82728aa302..f313948fe7 100644 --- a/ansible/roles/prechecks/tasks/service_checks.yml +++ b/ansible/roles/prechecks/tasks/service_checks.yml @@ -73,6 +73,6 @@ changed_when: false failed_when: result | failed when: - - inventory_hostname in groups['cinder-volume'] - enable_cinder | bool - enable_cinder_backend_lvm | bool + - inventory_hostname in groups['cinder-volume']