stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #689 from enovance/cisco-neutron

Browse Source 
network/cisco-plugins: use keystone neutron password
This commit is contained in:
Yanis Guenane
2014-10-16 11:41:46 -04:00
parent 82ba6d8b27 11073fd92f
commit e891351421
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/network.pp
View File

@@ -115,7 +115,7 @@ class cloud::network(
$ks_keystone_admin_host = '127.0.0.1',
$ks_keystone_admin_proto = 'http',
$ks_keystone_admin_port = 35357,
$ks_keystone_admin_password = 'secrete',
$ks_neutron_password = 'neutronpassword',
# DEPRECATED PARAMETERS
$tunnel_eth = false,
$tunnel_types = false,
@@ -164,7 +164,7 @@ class cloud::network(
database_password => $neutron_db_password,
database_host => $neutron_db_host,
keystone_auth_url => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0/",
keystone_password => $ks_keystone_admin_password,
keystone_password => $ks_neutron_password,
vswitch_plugin => 'neutron.plugins.cisco.n1kv.n1kv_neutron_plugin.N1kvNeutronPluginV2',
}
neutron_plugin_cisco {