keystone-authtoken missing in nova.conf

dzungdo · Sep 6, 2013 · c7a1775 · c7a1775
1 parent 738128d
commit c7a1775
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/puppet/modules/quickstack/manifests/compute.pp b/puppet/modules/quickstack/manifests/compute.pp
@@ -106,6 +106,17 @@
  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';
+
+ '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':
  proto => 'tcp',
  dport => '5900-5999',

diff --git a/puppet/modules/quickstack/manifests/controller.pp b/puppet/modules/quickstack/manifests/controller.pp
@@ -119,6 +119,11 @@
  '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 => '127.0.0.1';
  }
 
  class { [ 'nova::scheduler', 'nova::cert', 'nova::consoleauth', 'nova::conductor' ]:
@@ -194,7 +199,7 @@
  neutron_admin_tenant_name => 'admin',
  neutron_admin_username => 'admin',
  }
-
+ 
  firewall { '001 controller incoming':
  proto => 'tcp',
  # need to refine this list