openstack/openstack-ansible
Code Issues Proposed changes

Add telemetry service bundle to AIO tests

Browse Source 
In order to test the telemetry service bundle across all
the roles concerned, we add them with a specific bundle
name in the AIO bootstrap.

As part of this, we move the special word list into a var
to make it easier to read and maintain.

Change-Id: Ibc4d83563eb303f1829daf3f93d35dcb1d23982b
This commit is contained in:
Jesse Pretorius 2019-03-26 20:15:59 +00:00 committed by Dmitriy Rabotjagov
parent 48266cefb5
commit aad13b822b
3 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/roles/bootstrap-host/vars/main.yml
View File

@ -13,10 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
bootstrap_host_special_word_list:
- aio
- distro
- lxc
- metal
- nspawn
- proxy
- source
- telemetry
- translations
bootstrap_host_services: >-
{%- set scenario_list = (bootstrap_host_scenario.split('_') | reject('equalto', '')) | list %}
{%- set service_list = ['keystone'] %}
{%- set service_list_extra = scenario_list | difference(['aio', 'distro', 'lxc', 'nspawn', 'metal', 'source', 'translations', 'proxy']) %}
{%- set service_list_extra = scenario_list | difference(bootstrap_host_special_word_list) %}
{%- if 'metal' not in scenario_list %}
{%- set _ = service_list.append('haproxy') %}
{%- endif %}
@ -29,6 +40,9 @@ bootstrap_host_services: >-
{%- if 'ironic' in scenario_list %}
{%- set _ = service_list.extend(['swift']) %}
{%- endif %}
{%- if 'telemetry' in scenario_list %}
{%- set _ = service_list.extend(['aodh', 'ceilometer', 'gnocchi', 'panko']) %}
{%- endif %}
{%- if 'translations' in scenario_list %}
{%- set _ = service_list.extend(['designate', 'heat', 'magnum', 'sahara', 'swift', 'trove']) %}
{%- endif %}

24
zuul.d/jobs.yaml
View File

@ -119,6 +119,14 @@
action: deploy
scenario: aio_metal
- job:
name: openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
parent: openstack-ansible-deploy-aio
nodeset: ubuntu-bionic
vars:
action: deploy
scenario: aio_telemetry_metal
- job:
name: openstack-ansible-deploy-aio_distro_metal-ubuntu-bionic
parent: openstack-ansible-deploy-aio
@ -224,6 +232,14 @@
actio: deploy
scenario: aio_metal
- job:
name: openstack-ansible-deploy-aio_telemetry_metal-centos-7
parent: openstack-ansible-deploy-aio
nodeset: centos-7
vars:
action: deploy
scenario: aio_telemetry_metal
- job:
name: openstack-ansible-deploy-aio_distro_metal-centos-7
parent: openstack-ansible-deploy-aio
@ -287,6 +303,14 @@
action: deploy
scenario: aio_metal
- job:
name: openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
parent: openstack-ansible-deploy-aio
nodeset: opensuse-150
vars:
action: deploy
scenario: aio_telemetry_metal
- job:
name: openstack-ansible-deploy-aio_distro_metal-opensuse-150
parent: openstack-ansible-deploy-aio

14
zuul.d/project-templates.yaml
View File

@ -79,6 +79,20 @@
jobs:
- openstack-ansible-deploy-aio_metal-opensuse-150
- project-template:
name: openstack-ansible-deploy-aio_telemetry_metal-jobs
check:
jobs:
- openstack-ansible-deploy-aio_telemetry_metal-centos-7
- openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
gate:
jobs:
- openstack-ansible-deploy-aio_telemetry_metal-centos-7
- openstack-ansible-deploy-aio_telemetry_metal-ubuntu-bionic
experimental:
jobs:
- openstack-ansible-deploy-aio_telemetry_metal-opensuse-150
- project-template:
name: openstack-ansible-deploy-aio_distro_metal-jobs
check: