adjusting nova config for computes

dzungdo · Sep 6, 2013 · ed333f3 · ed333f3
1 parent 92aaaa1
commit ed333f3
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/puppet/modules/quickstack/manifests/compute.pp b/puppet/modules/quickstack/manifests/compute.pp
@@ -15,13 +15,24 @@
 
  # Configure Nova
  nova_config{
- 'DEFAULT/auto_assign_floating_ip': value => 'True';
- #"DEFAULT/network_host": value => ${pacemaker_priv_floating_ip;
- "DEFAULT/network_host": value => "$::ipaddress";
- "DEFAULT/libvirt_inject_partition": value => "-1";
- #"DEFAULT/metadata_host": value => "$pacemaker_priv_floating_ip";
- "DEFAULT/metadata_host": value => "$::ipaddress";
- "DEFAULT/multi_host": value => "True";
+ 'DEFAULT/libvirt_inject_partition': value => '-1';
+
+ ### Networking
+ 'DEFAULT/service_neutron_metadata_proxy': value => 'True';
+ 'DEFAULT/neutron_metadata_proxy_shared_secret': value => 'secret';
+
+ # To review if obsolete (nova network)
+ # 'DEFAULT/auto_assign_floating_ip': value => 'True';
+ # 'DEFAULT/network_host': value => $pacemaker_priv_floating_ip;
+ # 'DEFAULT/metadata_host': value => $pacemaker_priv_floating_ip;
+ # '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;
  }
 
  class { 'nova':
@@ -105,17 +116,6 @@
  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',