From: Frank Brockners <fbrockne@cisco.com>
Date: Wed, 3 Jun 2015 14:03:20 +0000 (+0000)
Subject: Merge "Adds external router and fixes metadata server"
X-Git-Tag: arno.2015.1.0~14
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ce119468cddab263baa6bbed0badc6fd9d724c5e;hp=a6dffc714d50c5a94faa5b2a5b9fc74f3ee384f0;p=genesis.git

Merge "Adds external router and fixes metadata server"
---

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',
+  }
  }
 }