From 2845d3fa299b180ed761cc8ca4fcb7e1a43d9aa2 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 2 Oct 2018 13:15:53 +0200 Subject: 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 --- .../os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml | 9 +++++++++ .../os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml | 5 +++++ .../os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml | 5 +++++ 3 files changed, 19 insertions(+) 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 6d2b490a..838ea46c 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 ac17d89d..48ce06e9 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 ee8889d2..5caed125 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: -- cgit 1.2.3-korg