Get the list of enabled_services on the overcloud

This patch fixes the way we compute the enabled_services
list on the overcloud.
We don't need to use hiera anymore since the overcloud
services are already provided by config-download.
This patch also fixes the condition to check if a service
is present in the list.

Change-Id: I9952a4df122c00c0163b7e79dab8a821e3feff06
Closes-Bug: #1867004
This commit is contained in:
Francesco Pantano 2020-03-12 15:48:03 +01:00
parent 2b5c03f38c
commit 02ea16fbf2
No known key found for this signature in database
GPG Key ID: 799868C47301D458
3 changed files with 8 additions and 9 deletions

View File

@ -44,7 +44,7 @@
manila_key: [{'name': '{{ ".".join(("client", ceph_keys.manila.name)) }}', 'key': '{{ ceph_keys.manila.key }}',
'mode': '0600', 'caps': '{{ manila_caps }}'}]
when:
- "'manila_api' in {{ enabled_services.stdout }}"
- tripleo_enabled_services | intersect(['manila_api'])
- name: build radosgw key for openstack
vars:
@ -53,7 +53,7 @@
rgw_key: [{'name': '{{ ".".join(("client", ceph_keys.radosgw.name)) }}', 'key': '{{ ceph_keys.radosgw.key }}',
'mode': '0600', 'caps': '{{ rgw_caps }}'}]
when:
- "'ceph_rgw' in {{ enabled_services.stdout }}"
- tripleo_enabled_services | intersect(['ceph_rgw'])
- name: build the resulting keys
set_fact:

View File

@ -48,7 +48,7 @@
'application': 'openstack_gnocchi'}]
when:
- tripleo_pool_metrics
- "'gnocchi_api' in {{ enabled_services.stdout }}"
- tripleo_enabled_services | intersect(['gnocchi_api'])
- ceph_pools.gnocchi_pool.name not in overrides|default([])
- name: add cinder backup pool
@ -58,7 +58,7 @@
when:
- tripleo_pool_volumes
- tripleo_pool_backup
- "'cinder_backup' in {{ enabled_services.stdout }}"
- tripleo_enabled_services | intersect(['cinder_backup'])
- ceph_pools.cinder_backup_pool.name not in overrides|default([])
- name: add cinder extra pools
@ -88,4 +88,4 @@
cephfs_metadata: {'cephfs_metadata_pool': {'name': '{{ manila_pools.metadata }}', 'pg_num': '{{ manila_pools.metadata_pg_num }}',
'rule_name': 'replicated_rule', 'application': 'cephfs'}}
when:
- "'manila_api' in {{ enabled_services.stdout }}"
- tripleo_enabled_services | intersect(['manila_api'])

View File

@ -39,10 +39,9 @@
- run_uuid_ansible
- run_ceph_ansible
- name: gather hiera metadata
command: hiera -c /etc/puppet/hiera.yaml enabled_services
register: enabled_services
become: true
- name: get the list of enabled services on the overcloud
set_fact:
tripleo_enabled_services: "{{ enabled_services | default([]) }}"
- name: build the openstack pool list
import_tasks: build_pools.yml