stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Puppetfile: use latest stable/juno ref

Browse Source 
Change-Id: I8cb8544d872a9738c2769f503f679b977c670c4d
This commit is contained in:
Emilien Macchi
2015-07-03 11:31:34 -04:00
committed by Yanis Guenane
parent 5ee34b04c2
commit e8d6d0ff25
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Puppetfile
View File

@@ -40,7 +40,7 @@ mod 'keystone',
:ref => '4b2623d4ec41957b0274d8a457e3019fdf1e342b' :ref => '4b2623d4ec41957b0274d8a457e3019fdf1e342b'
mod 'neutron', mod 'neutron',
:git => 'git://github.com/enovance/puppet-neutron.git', :git => 'git://github.com/enovance/puppet-neutron.git',
:ref => '183541d3890cd212db5a581470bdf98c21c40ad7' :ref => 'e981bc2533b349fae3e06ca3989f1bceece94610'
mod 'nova', mod 'nova',
:git => 'git://github.com/enovance/puppet-nova.git', :git => 'git://github.com/enovance/puppet-nova.git',
:ref => 'cc1a2a348a7953298c75881a5c4afafeb3d0a4e4' :ref => 'cc1a2a348a7953298c75881a5c4afafeb3d0a4e4'

21
manifests/network/metadata.pp
View File

@@ -76,15 +76,18 @@ class cloud::network::metadata(
include 'cloud::network::vswitch' include 'cloud::network::vswitch'
class { 'neutron::agents::metadata': class { 'neutron::agents::metadata':
enabled => $enabled, enabled => $enabled,
shared_secret => $neutron_metadata_proxy_shared_secret, shared_secret => $neutron_metadata_proxy_shared_secret,
debug => $debug, debug => $debug,
metadata_ip => $nova_metadata_server, metadata_ip => $nova_metadata_server,
auth_url => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0", auth_url => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0",
auth_password => $ks_neutron_password, auth_password => $ks_neutron_password,
auth_region => $auth_region, auth_region => $auth_region,
metadata_workers => $::processorcount, metadata_workers => $::processorcount,
metadata_protocol => $ks_nova_internal_proto, }
neutron_metadata_agent_config {
'DEFAULT/nova_metadata_protocol': value => $ks_nova_internal_proto;
} }
} }