aboutsummaryrefslogtreecommitdiffstats
path: root/scenarios/os-odl-nofeature/role
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-09-17 12:16:18 +0200
committerManuel Buil <mbuil@suse.com>2018-10-24 12:52:33 +0000
commit5ebd2524221e13cf55af255f1becc763564d7619 (patch)
tree3a75d00c3d21c0ff9fc3607529214630e04b8db8 /scenarios/os-odl-nofeature/role
parent22a1b3637e77a5656022fc1b21cdec0a5638e2c5 (diff)
Ceilometer must be deployed for odl scenarios
Ceilometer is a dependency in the networking-odl repo and thus we require the ceilometer component to be deployed for all the scenarios including odl deploy-scenario:os-odl-nofeature installer-type:osa Change-Id: I3281ceec07f72512fba3a804957a0f8ac36b509e Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'scenarios/os-odl-nofeature/role')
-rw-r--r--scenarios/os-odl-nofeature/role/os-odl-nofeature/files/ha/openstack_user_config.yml9
-rw-r--r--scenarios/os-odl-nofeature/role/os-odl-nofeature/files/mini/openstack_user_config.yml5
-rw-r--r--scenarios/os-odl-nofeature/role/os-odl-nofeature/files/noha/openstack_user_config.yml5
-rw-r--r--scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j23
4 files changed, 22 insertions, 0 deletions
diff --git a/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/ha/openstack_user_config.yml b/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/ha/openstack_user_config.yml
index 2ca5a98..6877ada 100644
--- a/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/ha/openstack_user_config.yml
+++ b/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/ha/openstack_user_config.yml
@@ -202,6 +202,15 @@ network_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
+
# nova hypervisors
compute_hosts:
compute00:
diff --git a/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/mini/openstack_user_config.yml b/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/mini/openstack_user_config.yml
index 0f8ccd1..ab8cd62 100644
--- a/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/mini/openstack_user_config.yml
+++ b/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/mini/openstack_user_config.yml
@@ -145,6 +145,11 @@ network_hosts:
controller00:
ip: 172.29.236.11
+# ceilometer
+metering-infra_hosts:
+ controller00:
+ ip: 172.29.236.11
+
# nova hypervisors
compute_hosts:
compute00:
diff --git a/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/noha/openstack_user_config.yml b/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/noha/openstack_user_config.yml
index 7ed9cd3..3a8f9b5 100644
--- a/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/noha/openstack_user_config.yml
+++ b/scenarios/os-odl-nofeature/role/os-odl-nofeature/files/noha/openstack_user_config.yml
@@ -145,6 +145,11 @@ network_hosts:
controller00:
ip: 172.29.236.11
+# ceilometer
+metering-infra_hosts:
+ controller00:
+ ip: 172.29.236.11
+
# nova hypervisors
compute_hosts:
compute00:
diff --git a/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2 b/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
index eb08adc..600a498 100644
--- a/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
+++ b/scenarios/os-odl-nofeature/role/os-odl-nofeature/templates/user_variables_os-odl-nofeature.yml.j2
@@ -38,6 +38,9 @@ neutron_ml2_drivers_type: "flat,vlan,vxlan"
neutron_plugin_base:
- odl-router_v2
+
+# To get functest testcases work (otherwise it keeps trying to access the metadata server)
+neutron_dnsmasq_force_metadata: True
{% endraw %}
{% if odl_repo_version is defined %}