openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Install osc-placement package during client package installation" into stable/ussuri

This commit is contained in:
Zuul 2020-07-20 19:07:46 +00:00 committed by Gerrit Code Review
parent ea5e6060ca 80e0bf2e1f
commit 2eb4909281
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tripleo_ansible/roles/tripleo_clients_install/defaults/main.yml
View File

@ -21,21 +21,22 @@
tripleo_clients_install_pkg_state: present tripleo_clients_install_pkg_state: present
tripleo_clients_install_dict: tripleo_clients_install_dict:
aodh: present aodhclient: present
barbican: present barbicanclient: present
cinder: present cinderclient: present
designate: present designateclient: present
glance: present glanceclient: present
gnocchi: present gnocchiclient: present
heat: present heatclient: present
ironic: present ironicclient: present
keystone: present keystoneclient: present
manila: present manilaclient: present
mistral: present mistralclient: present
neutron: present neutronclient: present
nova: present novaclient: present
openstack: present openstackclient: present
panko: present osc-placement: present
sahara: present pankoclient: present
swift: present saharaclient: present
zaqar: present swiftclient: present
zaqarclient: present

5
tripleo_ansible/roles/tripleo_clients_install/molecule/default/converge.yml
View File

@ -19,7 +19,8 @@
hosts: all hosts: all
vars: vars:
tripleo_clients_install_dict: tripleo_clients_install_dict:
aodh: installed aodhclient: installed
barbican: installed barbicanclient: installed
osc-placement: installed
roles: roles:
- role: "tripleo_clients_install" - role: "tripleo_clients_install"

2
tripleo_ansible/roles/tripleo_clients_install/tasks/main.yml
View File

@ -41,7 +41,7 @@
} }
%} %}
{% for k, v in tripleo_clients_install_dict.items() %} {% for k, v in tripleo_clients_install_dict.items() %}
{% set pkg_name = tripleo_clients_install_python_prefix ~ '-' ~ k ~ 'client' %} {% set pkg_name = tripleo_clients_install_python_prefix ~ '-' ~ k %}
{% if (tripleo_clients_install_pkg_state == 'present') and (v != tripleo_clients_install_pkg_state) %} {% if (tripleo_clients_install_pkg_state == 'present') and (v != tripleo_clients_install_pkg_state) %}
{% set _ = package_sets[v].append(pkg_name) %} {% set _ = package_sets[v].append(pkg_name) %}
{% else %} {% else %}