openstack/puppet-neutron
Code Issues Proposed changes

PLUMgrid metadata config.

Browse Source 
Add support for PLUMgrid metadata related configuration.
Parameters doc: https://wiki.openstack.org/wiki/PLUMgrid-Neutron

Change-Id: Ia74f9a01e794858b2bb110ace0394e805d22ff06
Signed-off-by: salmank <salmank@plumgrid.com>
This commit is contained in:
salmank
2015-06-23 13:37:59 +01:00
committed by Muhammad Salman Khan
parent 18cb802445
commit d7dff8f2d7
2 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
manifests/plugins/plumgrid.pp
View File

@@ -23,17 +23,32 @@
# [*controller_priv_host*]
# Controller private host IP
# Defaults to 127.0.0.1
# [*auth_protocol*]
# Authorization protocol
# Defaults to http
# [*nova_metadata_ip*]
# Nova metadata IP
# Defaults to 127.0.0.1
# [*nova_metadata_port*]
# Nova metadata port
# Defaults to 8775
# [*metadata_proxy_shared_secret*]
# Neutron metadata shared secret key
class neutron::plugins::plumgrid (
$director_server = '127.0.0.1',
$director_server_port = '443',
$username = undef,
$password = undef,
$servertimeout = '99',
$connection = 'http://127.0.0.1:35357/v2.0',
$admin_password = undef,
$controller_priv_host = '127.0.0.1',
$package_ensure = 'present'
$director_server = '127.0.0.1',
$director_server_port = '443',
$username = undef,
$password = undef,
$servertimeout = '99',
$connection = 'http://127.0.0.1:35357/v2.0',
$admin_password = undef,
$controller_priv_host = '127.0.0.1',
$auth_protocol = 'http',
$nova_metadata_ip = '127.0.0.1',
$nova_metadata_port = '8775',
$metadata_proxy_shared_secret = undef,
$package_ensure = 'present'
) {
include ::neutron::params
@@ -98,11 +113,14 @@ class neutron::plugins::plumgrid (
}
neutron_plumlib_plumgrid {
'keystone_authtoken/admin_user' : value => 'admin';
'keystone_authtoken/admin_password': value => $admin_password, secret =>true;
'keystone_authtoken/auth_uri': value => "http://${controller_priv_host}:35357/v2.0";
'keystone_authtoken/admin_tenant_name': value => 'admin';
'PLUMgridMetadata/enable_pg_metadata' : value => 'True';
'PLUMgridMetadata/metadata_mode': value => 'local';
'keystone_authtoken/admin_user' : value => 'admin';
'keystone_authtoken/admin_password': value => $admin_password, secret =>true;
'keystone_authtoken/auth_uri': value => "${auth_protocol}://${controller_priv_host}:35357/v2.0";
'keystone_authtoken/admin_tenant_name': value => 'admin';
'PLUMgridMetadata/enable_pg_metadata' : value => 'True';
'PLUMgridMetadata/metadata_mode': value => 'local';
'PLUMgridMetadata/nova_metadata_ip': value => $nova_metadata_ip;
'PLUMgridMetadata/nova_metadata_port': value => $nova_metadata_port;
'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret;
}
}

10
spec/classes/neutron_plugins_plumgrid_spec.rb
View File

@@ -13,7 +13,10 @@ describe 'neutron::plugins::plumgrid' do
:director_server_port => '443',
:servertimeout => '99',
:connection => 'http://127.0.0.1:35357/v2.0',
:controller_priv_host => '127.0.0.1'
:controller_priv_host => '127.0.0.1',
:auth_protocol => 'http',
:nova_metadata_ip => '127.0.0.1',
:nova_metadata_port => '8775',
}
end
@@ -58,10 +61,13 @@ describe 'neutron::plugins::plumgrid' do
is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/admin_user').with_value('admin')
is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/admin_password').with_value(params[:admin_password])
is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/admin_tenant_name').with_value('admin')
auth_uri = "http://" + params[:controller_priv_host] + ":" + "35357/v2.0";
auth_uri = params[:auth_protocol] + "://" + params[:controller_priv_host] + ":" + "35357/v2.0";
is_expected.to contain_neutron_plumlib_plumgrid('keystone_authtoken/auth_uri').with_value(auth_uri)
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/enable_pg_metadata').with_value('True')
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_mode').with_value('local')
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_ip').with_value(params[:nova_metadata_ip])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_port').with_value(params[:nova_metadata_port])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value(params[:metadata_proxy_shared_secret])
end
end