diff --git a/doc/source/readme.rst b/doc/source/readme.rst index a23a2f873..fc64d045e 100644 --- a/doc/source/readme.rst +++ b/doc/source/readme.rst @@ -126,7 +126,7 @@ As shown here, the validation playbook requires three top-level directives: ``hosts`` specify which nodes to run the validation on. Based on the ``hosts.sample`` structure, the options can be ``all`` (run on all nodes), -``undercloud``, ``overcloud`` (all overcloud nodes), ``controller`` and +``undercloud``, ``allovercloud`` (all overcloud nodes), ``controller`` and ``compute``. The ``vars`` section serves for storing variables that are going to be @@ -190,7 +190,7 @@ inventory file. It should look something like this:: [undercloud] undercloud.example.com - [overcloud:children] + [allovercloud:children] controller compute @@ -208,7 +208,7 @@ inventory file. It should look something like this:: It will have a ``[group]`` section for each role (``undercloud``, ``controller``, ``compute``) listing all the nodes belonging to that group. It is also possible to create a group from other groups as done with -``[overcloud:children]`` in the above example. If a validation specifies +``[allovercloud:children]`` in the above example. If a validation specifies ``hosts: overcloud``, it will be run on any node that belongs to the ``compute`` or ``controller`` groups. If a node happens to belong to both, the validation will only be run once. diff --git a/playbooks/ceph-dependencies-installed.yaml b/playbooks/ceph-dependencies-installed.yaml index 4fa880bf1..efed781c2 100644 --- a/playbooks/ceph-dependencies-installed.yaml +++ b/playbooks/ceph-dependencies-installed.yaml @@ -1,5 +1,5 @@ --- -- hosts: overcloud +- hosts: allovercloud vars: metadata: name: Check if Ceph dependencies are installed @@ -9,7 +9,7 @@ - pre-deployment - pre-ceph fail_without_deps: true - tripleo_delegate_to: "{{ groups['overcloud'] | default([]) }}" + tripleo_delegate_to: "{{ groups['allovercloud'] | default([]) }}" packages: - lvm2 tasks: diff --git a/playbooks/check-ftype.yaml b/playbooks/check-ftype.yaml index 8a52c2d3f..c1bfd8341 100644 --- a/playbooks/check-ftype.yaml +++ b/playbooks/check-ftype.yaml @@ -1,5 +1,5 @@ --- -- hosts: undercloud, overcloud +- hosts: undercloud, allovercloud vars: metadata: name: XFS ftype check diff --git a/playbooks/container-status.yaml b/playbooks/container-status.yaml index e4ae98988..7ae061020 100644 --- a/playbooks/container-status.yaml +++ b/playbooks/container-status.yaml @@ -1,5 +1,5 @@ --- -- hosts: undercloud, overcloud +- hosts: undercloud, allovercloud vars: metadata: name: Ensure container status diff --git a/playbooks/dns.yaml b/playbooks/dns.yaml index 475d39b95..232103084 100644 --- a/playbooks/dns.yaml +++ b/playbooks/dns.yaml @@ -1,5 +1,5 @@ --- -- hosts: undercloud, overcloud +- hosts: undercloud, allovercloud vars: metadata: name: Verify DNS diff --git a/playbooks/healthcheck-service-status.yaml b/playbooks/healthcheck-service-status.yaml index 58b7bf345..4516547b1 100644 --- a/playbooks/healthcheck-service-status.yaml +++ b/playbooks/healthcheck-service-status.yaml @@ -1,5 +1,5 @@ --- -- hosts: undercloud, overcloud +- hosts: undercloud, allovercloud vars: metadata: name: Healthcheck systemd services Check diff --git a/playbooks/no-op.yaml b/playbooks/no-op.yaml index 7b1de2b63..d360d5b9a 100644 --- a/playbooks/no-op.yaml +++ b/playbooks/no-op.yaml @@ -1,5 +1,5 @@ --- -- hosts: undercloud, overcloud +- hosts: undercloud, allovercloud vars: metadata: name: NO-OP validation diff --git a/playbooks/ntp.yaml b/playbooks/ntp.yaml index 39eb9429d..9accb8251 100644 --- a/playbooks/ntp.yaml +++ b/playbooks/ntp.yaml @@ -1,5 +1,5 @@ --- -- hosts: overcloud +- hosts: allovercloud vars: metadata: name: Verify all deployed nodes have their clock synchronised diff --git a/playbooks/repos.yaml b/playbooks/repos.yaml index 3ae221856..ecf34e722 100644 --- a/playbooks/repos.yaml +++ b/playbooks/repos.yaml @@ -1,5 +1,5 @@ --- -- hosts: undercloud, overcloud +- hosts: undercloud, allovercloud gather_facts: true vars: metadata: diff --git a/playbooks/service-status.yaml b/playbooks/service-status.yaml index fda4e67ec..78e4c4c55 100644 --- a/playbooks/service-status.yaml +++ b/playbooks/service-status.yaml @@ -1,5 +1,5 @@ --- -- hosts: undercloud, overcloud +- hosts: undercloud, allovercloud vars: metadata: name: Ensure services state diff --git a/playbooks/tls-everywhere-post-deployment.yaml b/playbooks/tls-everywhere-post-deployment.yaml index 5c1185b47..612f4081b 100644 --- a/playbooks/tls-everywhere-post-deployment.yaml +++ b/playbooks/tls-everywhere-post-deployment.yaml @@ -1,5 +1,5 @@ --- -- hosts: overcloud +- hosts: allovercloud vars: metadata: name: Confirm that overcloud nodes are setup correctly diff --git a/roles/node_health/tasks/main.yml b/roles/node_health/tasks/main.yml index fc3855b67..8d8bc2fa8 100644 --- a/roles/node_health/tasks/main.yml +++ b/roles/node_health/tasks/main.yml @@ -1,8 +1,8 @@ --- -- name: Collect IPs for overcloud nodes +- name: Collect IPs for allovercloud nodes set_fact: ansible_host="{{ hostvars[item]['ansible_host'] }}" register: oc_ips - with_items: "{{ groups.overcloud }}" + with_items: "{{ groups.allovercloud }}" - name: Ping all overcloud nodes icmp_ping: diff --git a/roles/openshift_on_openstack/tasks/openshift-nw-requirements.yaml b/roles/openshift_on_openstack/tasks/openshift-nw-requirements.yaml index 3050589e6..8633856e5 100644 --- a/roles/openshift_on_openstack/tasks/openshift-nw-requirements.yaml +++ b/roles/openshift_on_openstack/tasks/openshift-nw-requirements.yaml @@ -1,7 +1,7 @@ --- - name: Set fact to identify if the overcloud was deployed set_fact: - overcloud_deployed: "{{ groups['overcloud'] is defined }}" + overcloud_deployed: "{{ groups['allovercloud'] is defined }}" - name: Warn if no overcloud deployed yet warn: diff --git a/roles/openstack_endpoints/tasks/main.yml b/roles/openstack_endpoints/tasks/main.yml index d59d6a43f..98b1bd80e 100644 --- a/roles/openstack_endpoints/tasks/main.yml +++ b/roles/openstack_endpoints/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Set fact to identify if the overcloud was deployed set_fact: - overcloud_deployed: "{{ groups['overcloud'] is defined }}" + overcloud_deployed: "{{ groups['allovercloud'] is defined }}" # Check that the Horizon endpoint exists - name: Fail if the HorizonPublic endpoint is not defined