Browse Source

Merge "Install osc-placement package during client package installation"

changes/24/737624/4
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
f5b1dfcba3
3 changed files with 23 additions and 21 deletions
  1. +19
    -18
      tripleo_ansible/roles/tripleo_clients_install/defaults/main.yml
  2. +3
    -2
      tripleo_ansible/roles/tripleo_clients_install/molecule/default/converge.yml
  3. +1
    -1
      tripleo_ansible/roles/tripleo_clients_install/tasks/main.yml

+ 19
- 18
tripleo_ansible/roles/tripleo_clients_install/defaults/main.yml View File

@@ -21,21 +21,22 @@
tripleo_clients_install_pkg_state: present

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

+ 3
- 2
tripleo_ansible/roles/tripleo_clients_install/molecule/default/converge.yml View File

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

+ 1
- 1
tripleo_ansible/roles/tripleo_clients_install/tasks/main.yml View File

@@ -41,7 +41,7 @@
}
%}
{% 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) %}
{% set _ = package_sets[v].append(pkg_name) %}
{% else %}


Loading…
Cancel
Save