summaryrefslogtreecommitdiffstats
path: root/xci/file
diff options
context:
space:
mode:
Diffstat (limited to 'xci/file')
-rw-r--r--xci/file/ha/openstack_user_config.yml33
-rw-r--r--xci/file/mini/openstack_user_config.yml19
-rw-r--r--xci/file/noha/openstack_user_config.yml21
-rw-r--r--xci/file/setup-openstack.yml10
4 files changed, 0 insertions, 83 deletions
diff --git a/xci/file/ha/openstack_user_config.yml b/xci/file/ha/openstack_user_config.yml
index 43e88c0d..0c43702c 100644
--- a/xci/file/ha/openstack_user_config.yml
+++ b/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/xci/file/mini/openstack_user_config.yml b/xci/file/mini/openstack_user_config.yml
index c41f4329..70429cea 100644
--- a/xci/file/mini/openstack_user_config.yml
+++ b/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/xci/file/noha/openstack_user_config.yml b/xci/file/noha/openstack_user_config.yml
index 99974158..05de6a9c 100644
--- a/xci/file/noha/openstack_user_config.yml
+++ b/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/xci/file/setup-openstack.yml b/xci/file/setup-openstack.yml
index 2ffb907e..415c4899 100644
--- a/xci/file/setup-openstack.yml
+++ b/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