diff options
| author |   Frank Brockners <fbrockne@cisco.com> | 2015-06-03 14:03:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-06-03 14:03:20 +0000 |
| commit | ce119468cddab263baa6bbed0badc6fd9d724c5e (patch) | |
| tree | 48d90fc20fbdf09fad6c2842f02247314fe2b1a1 | |
| parent | a6dffc714d50c5a94faa5b2a5b9fc74f3ee384f0 (diff) | |
| parent | 0c4e53c303e4de80d6eeb23f851692f297cd2202 (diff) | |
Merge "Adds external router and fixes metadata server"
| -rw-r--r-- | common/puppet-opnfv/manifests/controller_networker.pp | 1 | ||||
| -rw-r--r-- | common/puppet-opnfv/manifests/external_net_setup.pp | 8 |
2 files changed, 9 insertions, 0 deletions
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', + } } } |