reversing to neutron/services user/tenant

dzungdo · Sep 6, 2013 · afbb7ea · afbb7ea
1 parent 0b0cf73
commit afbb7ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/puppet/modules/quickstack/manifests/compute.pp b/puppet/modules/quickstack/manifests/compute.pp
@@ -3,6 +3,7 @@
  $fixed_network_range = $quickstack::params::fixed_network_range,
  $floating_network_range = $quickstack::params::floating_network_range,
  $neutron_db_password = $quickstack::params::neutron_db_password,
+ $neutron_user_password = $quickstack::params::neutron_user_password,
  $nova_db_password = $quickstack::params::nova_db_password,
  $nova_user_password = $quickstack::params::nova_user_password,
  $pacemaker_priv_floating_ip = $quickstack::params::pacemaker_priv_floating_ip,
@@ -99,22 +100,20 @@
  } 
 
  class { '::nova::network::neutron':
- neutron_admin_password => $admin_password,
- neutron_admin_tenant_name => 'admin',
- neutron_admin_username => 'admin',
- neutron_url => 'http:https://192.168.0.11:9696',
- neutron_admin_auth_url => 'http:https://192.168.0.11:35357/v2.0',
+ neutron_admin_password => $neutron_user_password,
+ neutron_url => 'http:https://192.168.0.11:9696',
+ neutron_admin_auth_url => 'http:https://192.168.0.11:35357/v2.0',
  }
 
  nova_config {
-  'DEFAULT/auto_assign_floating_ip': value => 'True';
-  'DEFAULT/multi_host': value => 'True';
-  'DEFAULT/force_dhcp_release': value => 'False';
+ 'DEFAULT/auto_assign_floating_ip': value => 'True';
+ 'DEFAULT/multi_host': value => 'True';
+ 'DEFAULT/force_dhcp_release': value => 'False';
 
-  'keystone_authtoken/admin_tenant_name': value => 'admin';
-  'keystone_authtoken/admin_user': value => 'admin';
-  'keystone_authtoken/admin_password': value => $admin_password;
-  'keystone_authtoken/auth_host': value => $pacemaker_priv_floating_ip;
+ 'keystone_authtoken/admin_tenant_name': value => 'admin';
+ 'keystone_authtoken/admin_user': value => 'admin';
+ 'keystone_authtoken/admin_password': value => $admin_password;
+ 'keystone_authtoken/auth_host': value => $pacemaker_priv_floating_ip;
  }
 
  firewall { '001 nova compute incoming':

diff --git a/puppet/modules/quickstack/manifests/controller.pp b/puppet/modules/quickstack/manifests/controller.pp
@@ -14,6 +14,7 @@
  $keystone_db_password = $quickstack::params::keystone_db_password,
  $mysql_root_password = $quickstack::params::mysql_root_password,
  $neutron_db_password = $quickstack::params::neutron_db_password,
+ $neutron_user_password = $quickstack::params::neutron_user_password,
  $nova_db_password = $quickstack::params::nova_db_password,
  $nova_user_password = $quickstack::params::nova_user_password,
  $pacemaker_priv_floating_ip = $quickstack::params::pacemaker_priv_floating_ip,
@@ -179,8 +180,6 @@
  class { '::neutron::server':
  auth_host => $::ipaddress,
  auth_password => $admin_password,
- # auth_tenant => 'admin',
- # auth_user => 'admin',
  } 
 
  neutron_plugin_ovs {
@@ -195,9 +194,7 @@
  } 
 
  class { '::nova::network::neutron':
- neutron_admin_password => $admin_password,
- neutron_admin_tenant_name => 'admin',
- neutron_admin_username => 'admin',
+ neutron_admin_password => $neutron_user_password,
  }
 
  firewall { '001 controller incoming':