From 98899a911b1329cb177f47940e8be1de6d6a24e0 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Mon, 4 Mar 2019 15:21:03 +0100 Subject: [PATCH] Rename undercloud-neutron-sanity-check role This patch renames it 'neutron-sanity-check' as we can use this role to not only check the Undercloud Neutron configuration, but also on the Overcloud Controller. It also adds the playbook to sanity check Neutron on the Controller. Change-Id: I510bf5959b26cbe4bf2126842d335cf2a0cfddd8 Implements: blueprint validation-framework Signed-off-by: Gael Chamoulaud --- playbooks/neutron-sanity-check.yaml | 30 +++++++++++++++ .../undercloud-neutron-sanity-check.yaml | 2 +- .../defaults/main.yml | 1 - .../meta/main.yml | 3 +- .../tasks/main.yml | 0 .../undercloud-neutron-sanity-check/README.md | 38 ------------------- .../vars/main.yaml | 11 ------ 7 files changed, 32 insertions(+), 53 deletions(-) create mode 100644 playbooks/neutron-sanity-check.yaml rename roles/{undercloud-neutron-sanity-check => neutron-sanity-check}/defaults/main.yml (99%) rename roles/{undercloud-neutron-sanity-check => neutron-sanity-check}/meta/main.yml (93%) rename roles/{undercloud-neutron-sanity-check => neutron-sanity-check}/tasks/main.yml (100%) delete mode 100644 roles/undercloud-neutron-sanity-check/README.md delete mode 100644 roles/undercloud-neutron-sanity-check/vars/main.yaml diff --git a/playbooks/neutron-sanity-check.yaml b/playbooks/neutron-sanity-check.yaml new file mode 100644 index 000000000..d9f7e5d44 --- /dev/null +++ b/playbooks/neutron-sanity-check.yaml @@ -0,0 +1,30 @@ +--- +- hosts: Controller + vars: + metadata: + name: Neutron Sanity Check + description: > + Run `neutron-sanity-check` on the controller nodes to find out + potential issues with Neutron's configuration. + + The tool expects all the configuration files that are passed + to the Neutron services. + + groups: + - post-deployment + + # The list of Neutron configuration files and directories that + # will be passed to the Neutron services. The order is important + # here: the values in later files take precedence. + configs: + - /etc/neutron/neutron.conf + - /usr/share/neutron/neutron-dist.conf + - /etc/neutron/metadata_agent.ini + - /etc/neutron/dhcp_agent.ini + - /etc/neutron/fwaas_driver.ini + - /etc/neutron/l3_agent.ini + - /usr/share/neutron/neutron-lbaas-dist.conf + - /etc/neutron/lbaas_agent.ini + + roles: + - neutron-sanity-check diff --git a/playbooks/undercloud-neutron-sanity-check.yaml b/playbooks/undercloud-neutron-sanity-check.yaml index 255eca9b3..2c1a997c7 100644 --- a/playbooks/undercloud-neutron-sanity-check.yaml +++ b/playbooks/undercloud-neutron-sanity-check.yaml @@ -28,4 +28,4 @@ - /etc/neutron/lbaas_agent.ini roles: - - undercloud-neutron-sanity-check + - neutron-sanity-check diff --git a/roles/undercloud-neutron-sanity-check/defaults/main.yml b/roles/neutron-sanity-check/defaults/main.yml similarity index 99% rename from roles/undercloud-neutron-sanity-check/defaults/main.yml rename to roles/neutron-sanity-check/defaults/main.yml index 0e5329483..d2610d998 100644 --- a/roles/undercloud-neutron-sanity-check/defaults/main.yml +++ b/roles/neutron-sanity-check/defaults/main.yml @@ -1,5 +1,4 @@ --- - configs: - /etc/neutron/neutron.conf - /usr/share/neutron/neutron-dist.conf diff --git a/roles/undercloud-neutron-sanity-check/meta/main.yml b/roles/neutron-sanity-check/meta/main.yml similarity index 93% rename from roles/undercloud-neutron-sanity-check/meta/main.yml rename to roles/neutron-sanity-check/meta/main.yml index 02d3f9c92..c88e2edb0 100644 --- a/roles/undercloud-neutron-sanity-check/meta/main.yml +++ b/roles/neutron-sanity-check/meta/main.yml @@ -25,5 +25,4 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -dependencies: - - role: validation-db-utils +dependencies: [] diff --git a/roles/undercloud-neutron-sanity-check/tasks/main.yml b/roles/neutron-sanity-check/tasks/main.yml similarity index 100% rename from roles/undercloud-neutron-sanity-check/tasks/main.yml rename to roles/neutron-sanity-check/tasks/main.yml diff --git a/roles/undercloud-neutron-sanity-check/README.md b/roles/undercloud-neutron-sanity-check/README.md deleted file mode 100644 index 7d07fb2ef..000000000 --- a/roles/undercloud-neutron-sanity-check/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -An Ansible roles to check for potential issues with Neutron's configuration - -Requirements ------------- - -This role needs an installed and working Undercloud - -Role Variables --------------- - -- configs: A list of Neutron configuration files and directories that will be - passed to the Neutron services. The order is important here, the values in - later files take precedence. - -Dependencies ------------- - -No dependencies. - -Example Playbook ----------------- - - - hosts: undercloud - roles: - - { role: undercloud-neutron-sanity-check } - -License -------- - -Apache - -Author Information ------------------- - -Red Hat TripleO Validations Team diff --git a/roles/undercloud-neutron-sanity-check/vars/main.yaml b/roles/undercloud-neutron-sanity-check/vars/main.yaml deleted file mode 100644 index 6dc673ec0..000000000 --- a/roles/undercloud-neutron-sanity-check/vars/main.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -metadata: - name: Undercloud Neutron Sanity Check - description: > - Run `neutron-sanity-check` on the undercloud node to find out - potential issues with Neutron's configuration. - - The tool expects all the configuration files that are passed - to the Neutron services. - groups: - - pre-introspection