openstack/puppet-openstack-integration
Code Issues Proposed changes

Update nova::network::neutron parameters and drop ec2 param

Browse Source 
neutron_admin_password is deprecated, we need to use neutron_password
Also neutron_admin_auth_url, let's use default value.

Also drop ec2 params

Change-Id: I5def769b9394282c5c85fb3fa92dfa52d8d80ae8
This commit is contained in:
Emilien Macchi 2016-01-11 14:36:12 -05:00
parent 31d7cc7063
commit ebab2cc919
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/nova.pp
View File

@ -37,7 +37,6 @@ class openstack_integration::nova {
osapi_v3 => true, osapi_v3 => true,
neutron_metadata_proxy_shared_secret => 'a_big_secret', neutron_metadata_proxy_shared_secret => 'a_big_secret',
osapi_compute_workers => 2, osapi_compute_workers => 2,
ec2_workers => 2,
metadata_workers => 2, metadata_workers => 2,
default_floating_pool => 'public', default_floating_pool => 'public',
} }
@ -59,8 +58,7 @@ class openstack_integration::nova {
class { '::nova::scheduler': } class { '::nova::scheduler': }
class { '::nova::vncproxy': } class { '::nova::vncproxy': }
class { '::nova::network::neutron': class { '::nova::network::neutron':
neutron_admin_password => 'a_big_secret', neutron_password => 'a_big_secret',
neutron_admin_auth_url => 'http://127.0.0.1:35357/v2.0',
} }
} }