Adding molecule tests for no-op-firewall-nova-driver validation
This patch also transforms the Nova configuration file path into an
Ansible variable.
Change-Id: I0bbbe16fbb21acef79a5f66fbea963ce3fd0f57d
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
(cherry picked from commit 2fc0f674ce
)
This commit is contained in:
parent
93bee0f53c
commit
95fbe0b62d
|
@ -8,5 +8,6 @@
|
||||||
`NoopFirewallDriver`.
|
`NoopFirewallDriver`.
|
||||||
groups:
|
groups:
|
||||||
- post-deployment
|
- post-deployment
|
||||||
|
nova_conf_path: "/var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf"
|
||||||
roles:
|
roles:
|
||||||
- no-op-firewall-nova-driver
|
- no-op-firewall-nova-driver
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
---
|
||||||
|
nova_conf_path: /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf
|
|
@ -0,0 +1,37 @@
|
||||||
|
# Molecule managed
|
||||||
|
# Copyright 2019 Red Hat, Inc.
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
|
{% if item.registry is defined %}
|
||||||
|
FROM {{ item.registry.url }}/{{ item.image }}
|
||||||
|
{% else %}
|
||||||
|
FROM {{ item.image }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
|
||||||
|
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
|
||||||
|
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
|
||||||
|
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
|
||||||
|
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
|
||||||
|
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi
|
||||||
|
|
||||||
|
{% for pkg in item.easy_install | default([]) %}
|
||||||
|
# install pip for centos where there is no python-pip rpm in default repos
|
||||||
|
RUN easy_install {{ pkg }}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
|
||||||
|
CMD ["sh", "-c", "while true; do sleep 10000; done"]
|
|
@ -0,0 +1,47 @@
|
||||||
|
---
|
||||||
|
driver:
|
||||||
|
name: docker
|
||||||
|
|
||||||
|
log: true
|
||||||
|
|
||||||
|
platforms:
|
||||||
|
- name: centos7
|
||||||
|
hostname: centos7
|
||||||
|
image: centos:7
|
||||||
|
pkg_extras: python-setuptools python-enum34
|
||||||
|
easy_install:
|
||||||
|
- pip
|
||||||
|
environment: &env
|
||||||
|
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
||||||
|
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
||||||
|
|
||||||
|
- name: fedora28
|
||||||
|
hostname: fedora28
|
||||||
|
image: fedora:28
|
||||||
|
pkg_extras: python*-setuptools python*-enum
|
||||||
|
environment:
|
||||||
|
<<: *env
|
||||||
|
|
||||||
|
provisioner:
|
||||||
|
name: ansible
|
||||||
|
log: true
|
||||||
|
env:
|
||||||
|
ANSIBLE_STDOUT_CALLBACK: yaml
|
||||||
|
ANSIBLE_LIBRARY: "../../../../library"
|
||||||
|
|
||||||
|
scenario:
|
||||||
|
test_sequence:
|
||||||
|
- destroy
|
||||||
|
- create
|
||||||
|
- prepare
|
||||||
|
- converge
|
||||||
|
- verify
|
||||||
|
- destroy
|
||||||
|
|
||||||
|
lint:
|
||||||
|
enabled: false
|
||||||
|
|
||||||
|
verifier:
|
||||||
|
name: testinfra
|
||||||
|
lint:
|
||||||
|
name: flake8
|
|
@ -0,0 +1,70 @@
|
||||||
|
---
|
||||||
|
# Copyright 2019 Red Hat, Inc.
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
|
||||||
|
- name: Converge
|
||||||
|
hosts: all
|
||||||
|
gather_facts: no
|
||||||
|
|
||||||
|
vars:
|
||||||
|
nova_conf_path: "/nova.conf"
|
||||||
|
|
||||||
|
tasks:
|
||||||
|
- name: Successful Validation
|
||||||
|
block:
|
||||||
|
- name: Create a correct Nova config file
|
||||||
|
copy:
|
||||||
|
dest: "/nova.conf"
|
||||||
|
content: |
|
||||||
|
[DEFAULT]
|
||||||
|
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
||||||
|
|
||||||
|
- include_role:
|
||||||
|
name: no-op-firewall-nova-driver
|
||||||
|
vars:
|
||||||
|
nova_conf_path: "/nova.conf"
|
||||||
|
|
||||||
|
- debug:
|
||||||
|
msg: "The validation works as expected!"
|
||||||
|
|
||||||
|
- name: Failing Validation
|
||||||
|
block:
|
||||||
|
- name: Modifying Nova config file
|
||||||
|
ini_file:
|
||||||
|
dest: "/nova.conf"
|
||||||
|
section: DEFAULT
|
||||||
|
option: firewall_driver
|
||||||
|
value: CHANGEME
|
||||||
|
backup: yes
|
||||||
|
|
||||||
|
- include_role:
|
||||||
|
name: no-op-firewall-nova-driver
|
||||||
|
vars:
|
||||||
|
nova_conf_path: "/nova.conf"
|
||||||
|
rescue:
|
||||||
|
- name: Clear host errors
|
||||||
|
meta: clear_host_errors
|
||||||
|
|
||||||
|
- debug:
|
||||||
|
msg: "The validation fails as expected! End the playbook run"
|
||||||
|
|
||||||
|
- name: End play
|
||||||
|
meta: end_play
|
||||||
|
|
||||||
|
- name: Fail the test
|
||||||
|
fail:
|
||||||
|
msg: |
|
||||||
|
No-op-firewall-nova-driver validation failed finding bad configuration!
|
|
@ -2,7 +2,7 @@
|
||||||
- name: Read the `firewall_driver` value
|
- name: Read the `firewall_driver` value
|
||||||
become: true
|
become: true
|
||||||
ini:
|
ini:
|
||||||
path: /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova/nova.conf
|
path: "{{ nova_conf_path }}"
|
||||||
section: DEFAULT
|
section: DEFAULT
|
||||||
key: firewall_driver
|
key: firewall_driver
|
||||||
register: nova_firewall_driver
|
register: nova_firewall_driver
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
- tripleo-validations-centos-7-molecule-undercloud-debug
|
- tripleo-validations-centos-7-molecule-undercloud-debug
|
||||||
- tripleo-validations-centos-7-molecule-undercloud-disk-space
|
- tripleo-validations-centos-7-molecule-undercloud-disk-space
|
||||||
- tripleo-validations-centos-7-molecule-xfs-check-ftype
|
- tripleo-validations-centos-7-molecule-xfs-check-ftype
|
||||||
|
- tripleo-validations-centos-7-molecule-no-op-firewall-nova-driver
|
||||||
gate:
|
gate:
|
||||||
queue: integrated
|
queue: integrated
|
||||||
jobs:
|
jobs:
|
||||||
|
@ -28,6 +29,7 @@
|
||||||
- tripleo-validations-centos-7-molecule-undercloud-debug
|
- tripleo-validations-centos-7-molecule-undercloud-debug
|
||||||
- tripleo-validations-centos-7-molecule-undercloud-disk-space
|
- tripleo-validations-centos-7-molecule-undercloud-disk-space
|
||||||
- tripleo-validations-centos-7-molecule-xfs-check-ftype
|
- tripleo-validations-centos-7-molecule-xfs-check-ftype
|
||||||
|
- tripleo-validations-centos-7-molecule-no-op-firewall-nova-driver
|
||||||
name: tripleo-validations-molecule-jobs
|
name: tripleo-validations-molecule-jobs
|
||||||
- job:
|
- job:
|
||||||
files:
|
files:
|
||||||
|
@ -107,3 +109,10 @@
|
||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
tripleo_validations_role_name: xfs-check-ftype
|
tripleo_validations_role_name: xfs-check-ftype
|
||||||
|
- job:
|
||||||
|
files:
|
||||||
|
- ^roles/no-op-firewall-nova-driver/.*
|
||||||
|
name: tripleo-validations-centos-7-molecule-no-op-firewall-nova-driver
|
||||||
|
parent: tripleo-validations-centos-7-base
|
||||||
|
vars:
|
||||||
|
tripleo_validations_role_name: no-op-firewall-nova-driver
|
||||||
|
|
Loading…
Reference in New Issue