aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-10-02 13:15:53 +0200
committerManuel Buil <mbuil@suse.com>2018-10-02 16:17:05 +0200
commit2845d3fa299b180ed761cc8ca4fcb7e1a43d9aa2 (patch)
treeed7f276f18286ea372591e383e1b43963eeec59f
parent77bdb6a79a506f91959070dc8ff28949f2dff825 (diff)
Add ceilometer to the scenario
Due to the n-odl dependency, ceilometer must be part of the scenario. There is a chicken-egg problem with this patch. There is a XCI patch which will not get a +1 from jenkins if this patch does not get merged. However, this patch will not get a +1 from jenkins unless XCI patch gets merged. This is XCI's patch: https://gerrit.opnfv.org/gerrit/#/c/62419/ Change-Id: I145ac35dcb94d40f6e21a1a49ae5a1e754434a10 Signed-off-by: Manuel Buil <mbuil@suse.com>
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml9
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml5
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml5
3 files changed, 19 insertions, 0 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml
index 6d2b490..838ea46 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml
@@ -200,6 +200,15 @@ mano_hosts:
controller02:
ip: 172.29.236.13
+# ceilometer
+metering-infra_hosts:
+ controller00:
+ ip: 172.29.236.11
+ controller01:
+ ip: 172.29.236.12
+ controller02:
+ ip: 172.29.236.13
+
# neutron server, agents (L3, etc)
network_hosts:
controller00:
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml
index ac17d89..48ce06e 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml
@@ -144,6 +144,11 @@ mano_hosts:
controller00:
ip: 172.29.236.11
+# ceilometer
+metering-infra_hosts:
+ controller00:
+ ip: 172.29.236.11
+
# neutron server, agents (L3, etc)
network_hosts:
controller00:
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml
index ee8889d..5caed12 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml
@@ -144,6 +144,11 @@ mano_hosts:
controller00:
ip: 172.29.236.11
+# ceilometer
+metering-infra_hosts:
+ controller00:
+ ip: 172.29.236.11
+
# neutron server, agents (L3, etc)
network_hosts:
controller00: