adding neutron metadata-agent

dzungdo · Sep 9, 2013 · f09ba90 · f09ba90
1 parent 6866488
commit f09ba90
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/puppet/modules/quickstack/manifests/controller.pp b/puppet/modules/quickstack/manifests/controller.pp
@@ -121,10 +121,13 @@
  'DEFAULT/multi_host': value => 'True';
  'DEFAULT/force_dhcp_release': value => 'False';
 
+ 'DEFAULT/service_neutron_metadata_proxy': value => 'True';
+ 'DEFAULT/neutron_metadata_proxy_shared_secret': value => 'shared_secret';
+
  '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';
+ 'keystone_authtoken/auth_host': value => '127.0.0.1'; 
  }
 
  class { [ 'nova::scheduler', 'nova::cert', 'nova::consoleauth', 'nova::conductor' ]:
@@ -184,7 +187,7 @@
 
  neutron_plugin_ovs {
  'OVS/enable_tunneling': value => 'True';
- 
+
  'SECURITYGROUP/firewall_driver': 
  value => 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver';
  } 

diff --git a/puppet/modules/quickstack/manifests/networker.pp b/puppet/modules/quickstack/manifests/networker.pp
@@ -46,6 +46,13 @@
 
  class { '::neutron::agents::l3': }
 
+ class { 'neutron::agents::metadata': 
+ auth_password => $admin_password,
+ shared_secret => 'shared_secret',
+ auth_url => "https://${pacemaker_priv_floating_ip}:35357/v2.0",
+ metadata_ip => $pacemaker_priv_floating_ip,
+ }
+
  #class { 'neutron::agents::lbaas': }
 
  #class { 'neutron::agents::fwaas': }