openstack/puppet-neutron
Code Issues Proposed changes

Correction in PLUMgrid plugin configurations

Browse Source 
This patch set corrects some configurations in PLUMgrid neutron plugin to support l2gateway feature.

Doc-ref: https://wiki.openstack.org/wiki/PLUMgrid-Neutron

This change needs to be cherry-picked to stable/liberty and stable/mitaka as well.

Change-Id: I7aba9d59a0422104260f4e1f1d5c20279ae552e2
This commit is contained in:
Abdul Qadeer Khan 2016-07-21 03:50:07 -07:00
parent 4ad3cd318b
commit 154988a20d
2 changed files with 6 additions and 6 deletions
manifests/plugins
plumgrid.pp
spec/classes
neutron_plugins_plumgrid_spec.rb

6
manifests/plugins/plumgrid.pp

@ -168,6 +168,9 @@ class neutron::plugins::plumgrid (
'PLUMgridDirector/password': value => $password, secret =>true;
'PLUMgridDirector/servertimeout': value => $servertimeout;
'database/connection': value => $connection;
'l2gateway/vendor': value => $l2gateway_vendor;
'l2gateway/sw_username': value => $l2gateway_sw_username;
'l2gateway/sw_password': value => $l2gateway_sw_password;
}
neutron_plumlib_plumgrid {
@ -184,8 +187,5 @@ class neutron::plugins::plumgrid (
'PLUMgridMetadata/nova_metadata_subnet': value => $nova_metadata_subnet;
'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret;
'ConnectorType/connector_type': value => $connector_type;
'l2gateway/vendor': value => $l2gateway_vendor;
'l2gateway/sw_username': value => $l2gateway_sw_username;
'l2gateway/sw_password': value => $l2gateway_sw_password;
}
}

6
spec/classes/neutron_plugins_plumgrid_spec.rb

@ -72,6 +72,9 @@ describe 'neutron::plugins::plumgrid' do
is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/password').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/servertimeout').with_value(params[:servertimeout])
is_expected.to contain_neutron_plugin_plumgrid('database/connection').with_value(params[:connection])
is_expected.to contain_neutron_plugin_plumgrid('l2gateway/vendor').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_username').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_password').with_value('<SERVICE DEFAULT>')
end
it 'should perform default configuration of plumgrid plumlib' do
@ -89,9 +92,6 @@ describe 'neutron::plugins::plumgrid' do
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_subnet').with_value(params[:nova_metadata_subnet])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plumlib_plumgrid('ConnectorType/connector_type').with_value('distributed')
is_expected.to contain_neutron_plumlib_plumgrid('l2gateway/vendor').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plumlib_plumgrid('l2gateway/sw_username').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plumlib_plumgrid('l2gateway/sw_password').with_value('<SERVICE DEFAULT>')
end
end