From e7b8a0114b3607dd6b3f884fe269d5536d20a5d2 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 6 Apr 2017 10:46:36 -0700 Subject: [PATCH] xci: Exclude aodh, ceilometer, and gnocchi from deployments Aodh is broken on the master branch due to use of conflicting sqlAlhcemy package, causing issues during osa repo_build. This patch disables aodh and the related services ceilometer and gnocchi since the reason for us to have these 2 is to get aodh. See the failure from https://build.opnfv.org/ci/job/xci-deploy-virtual-xenial-daily-master/26/consoleFull Change-Id: Ic6b74328cf1692b5e26c5f30b3eb3799240c7117 Signed-off-by: Fatih Degirmenci --- prototypes/xci/file/ha/openstack_user_config.yml | 33 ---------------------- prototypes/xci/file/mini/openstack_user_config.yml | 19 ------------- prototypes/xci/file/noha/openstack_user_config.yml | 21 -------------- prototypes/xci/file/setup-openstack.yml | 10 ------- 4 files changed, 83 deletions(-) diff --git a/prototypes/xci/file/ha/openstack_user_config.yml b/prototypes/xci/file/ha/openstack_user_config.yml index 43e88c0d0..0c43702cb 100644 --- a/prototypes/xci/file/ha/openstack_user_config.yml +++ b/prototypes/xci/file/ha/openstack_user_config.yml @@ -200,33 +200,6 @@ network_hosts: controller02: ip: 172.29.236.13 -# ceilometer (telemetry API) -metering-infra_hosts: - controller00: - ip: 172.29.236.11 - controller01: - ip: 172.29.236.12 - controller02: - ip: 172.29.236.13 - -# aodh (telemetry alarm service) -metering-alarm_hosts: - controller00: - ip: 172.29.236.11 - controller01: - ip: 172.29.236.12 - controller02: - ip: 172.29.236.13 - -# gnocchi (telemetry metrics storage) -metrics_hosts: - controller00: - ip: 172.29.236.11 - controller01: - ip: 172.29.236.12 - controller02: - ip: 172.29.236.13 - # nova hypervisors compute_hosts: compute00: @@ -234,12 +207,6 @@ compute_hosts: compute01: ip: 172.29.236.15 -# ceilometer compute agent (telemetry) -metering-compute_hosts: - compute00: - ip: 172.29.236.14 - compute01: - ip: 172.29.236.15 # cinder volume hosts (NFS-backed) # The settings here are repeated for each infra host. # They could instead be applied as global settings in diff --git a/prototypes/xci/file/mini/openstack_user_config.yml b/prototypes/xci/file/mini/openstack_user_config.yml index c41f4329d..70429cea9 100644 --- a/prototypes/xci/file/mini/openstack_user_config.yml +++ b/prototypes/xci/file/mini/openstack_user_config.yml @@ -144,30 +144,11 @@ network_hosts: controller00: ip: 172.29.236.11 -# ceilometer (telemetry API) -metering-infra_hosts: - controller00: - ip: 172.29.236.11 - -# aodh (telemetry alarm service) -metering-alarm_hosts: - controller00: - ip: 172.29.236.11 - -# gnocchi (telemetry metrics storage) -metrics_hosts: - controller00: - ip: 172.29.236.11 - # nova hypervisors compute_hosts: compute00: ip: 172.29.236.12 -# ceilometer compute agent (telemetry) -metering-compute_hosts: - compute00: - ip: 172.29.236.12 # cinder volume hosts (NFS-backed) # The settings here are repeated for each infra host. # They could instead be applied as global settings in diff --git a/prototypes/xci/file/noha/openstack_user_config.yml b/prototypes/xci/file/noha/openstack_user_config.yml index 999741580..05de6a9c1 100644 --- a/prototypes/xci/file/noha/openstack_user_config.yml +++ b/prototypes/xci/file/noha/openstack_user_config.yml @@ -144,21 +144,6 @@ network_hosts: controller00: ip: 172.29.236.11 -# ceilometer (telemetry API) -metering-infra_hosts: - controller00: - ip: 172.29.236.11 - -# aodh (telemetry alarm service) -metering-alarm_hosts: - controller00: - ip: 172.29.236.11 - -# gnocchi (telemetry metrics storage) -metrics_hosts: - controller00: - ip: 172.29.236.11 - # nova hypervisors compute_hosts: compute00: @@ -166,12 +151,6 @@ compute_hosts: compute01: ip: 172.29.236.13 -# ceilometer compute agent (telemetry) -metering-compute_hosts: - compute00: - ip: 172.29.236.12 - compute01: - ip: 172.29.236.13 # cinder volume hosts (NFS-backed) # The settings here are repeated for each infra host. # They could instead be applied as global settings in diff --git a/prototypes/xci/file/setup-openstack.yml b/prototypes/xci/file/setup-openstack.yml index 2ffb907e4..415c48993 100644 --- a/prototypes/xci/file/setup-openstack.yml +++ b/prototypes/xci/file/setup-openstack.yml @@ -20,16 +20,6 @@ - include: os-neutron-install.yml - include: os-heat-install.yml - include: os-horizon-install.yml -- include: os-ceilometer-install.yml -- include: os-aodh-install.yml -#NOTE(stevelle) Ensure Gnocchi identities exist before Swift -- include: os-gnocchi-install.yml - when: - - gnocchi_storage_driver is defined - - gnocchi_storage_driver == 'swift' - vars: - gnocchi_identity_only: True - include: os-swift-install.yml -- include: os-gnocchi-install.yml - include: os-ironic-install.yml - include: os-tempest-install.yml -- 2.16.6