From 0c4e53c303e4de80d6eeb23f851692f297cd2202 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 2 Jun 2015 13:31:19 -0400 Subject: [PATCH] Adds external router and fixes metadata server External router is needed for rally to execute correctly even though it is not required for tenants to access external networks. This patch creates that router. Also, metadata server was not being used because password was not set. JIRA: BGS-55 Change-Id: If25f4f8ee2be3e49193e9e49c370cce68dde45cf Signed-off-by: Tim Rozet --- common/puppet-opnfv/manifests/controller_networker.pp | 1 + common/puppet-opnfv/manifests/external_net_setup.pp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/common/puppet-opnfv/manifests/controller_networker.pp b/common/puppet-opnfv/manifests/controller_networker.pp index 18a876c..157bc8f 100644 --- a/common/puppet-opnfv/manifests/controller_networker.pp +++ b/common/puppet-opnfv/manifests/controller_networker.pp @@ -106,6 +106,7 @@ class opnfv::controller_networker { if !$lb_backend_server_names { $lb_backend_server_names = $controllers_hostnames_array } if !$neutron_db_password { $neutron_db_password = $single_password } if !$neutron_user_password { $neutron_user_password = $single_password } + if !$neutron_metadata_proxy_secret { $neutron_metadata_proxy_secret = $single_password } if !$nova_db_password { $nova_db_password = $single_password } if !$nova_user_password { $nova_user_password = $single_password } if !$pcmk_server_addrs {$pcmk_server_addrs = $controllers_ip_array} diff --git a/common/puppet-opnfv/manifests/external_net_setup.pp b/common/puppet-opnfv/manifests/external_net_setup.pp index df9bdac..af00f20 100644 --- a/common/puppet-opnfv/manifests/external_net_setup.pp +++ b/common/puppet-opnfv/manifests/external_net_setup.pp @@ -73,5 +73,13 @@ class opnfv::external_net_setup { network_name => 'provider_network', tenant_name => 'admin', } + -> + neutron_router { 'provider_router': + ensure => present, + name => 'provider_router', + admin_state_up => true, + gateway_network_name => 'provider_network', + tenant_name => 'admin', + } } } -- 2.16.6