openstack
/
kayobe
Code Issues Proposed changes

Merge "Use {{ openstack_branch }} as version of kolla-ansible in ansible tests"

This commit is contained in:
Zuul 2019-12-12 12:39:01 +00:00 committed by Gerrit Code Review
parent 9332c211f4 225130a594
commit b98728f3d6
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/kolla-ansible/tests/test-defaults.yml
View File

@ -15,7 +15,7 @@
kolla_ansible_source_path: "{{ temp_path }}/src"
kolla_ansible_ctl_install_type: "source"
kolla_ansible_source_url: "http://github.com/openstack/kolla-ansible"
kolla_ansible_source_version: "master"
kolla_ansible_source_version: "{{ openstack_branch }}"
kolla_ansible_venv: "{{ temp_path }}/venv"
kolla_config_path: "{{ temp_path }}/etc/kolla"
kolla_node_custom_config_path: "{{ temp_path }}/etc/kolla/config"

2
ansible/roles/kolla-ansible/tests/test-extras.yml
View File

@ -57,7 +57,7 @@
kolla_ansible_source_path: "{{ temp_path }}/src"
kolla_ansible_ctl_install_type: "source"
kolla_ansible_source_url: "http://github.com/openstack/kolla-ansible"
kolla_ansible_source_version: "master"
kolla_ansible_source_version: "{{ openstack_branch }}"
kolla_ansible_venv: "{{ temp_path }}/venv"
kolla_ansible_vault_password: "fake-password"
kolla_config_path: "{{ temp_path }}/etc/kolla"

2
ansible/roles/kolla-ansible/tests/test-requirements.yml
View File

@ -15,7 +15,7 @@
kolla_ansible_source_path: "{{ temp_path }}/src"
kolla_ansible_ctl_install_type: "source"
kolla_ansible_source_url: "http://github.com/openstack/kolla-ansible"
kolla_ansible_source_version: "master"
kolla_ansible_source_version: "{{ openstack_branch }}"
kolla_ansible_venv: "{{ temp_path }}/venv"
kolla_ansible_venv_extra_requirements:
- "hvac"

6
tools/test-ansible.sh
View File

@ -7,7 +7,11 @@ set -e
failed=0
for playbook in ansible/roles/*/tests/main.yml; do
if ! ansible-playbook --connection=local $playbook $*; then
# We declare extra variables to install the {{ openstack_branch }} version
# of kolla-ansible. We should use {{ kolla_ansible_source_version }}, but
# adding ansible/group_vars/all/kolla would in turn require other
# extra-vars files (like pip) and may cause unintended side effects.
if ! ansible-playbook --connection=local $playbook $* -e @ansible/group_vars/all/openstack; then
failed=$((failed + 1))
fi
done