openstack
/
puppet-murano
Code Issues Proposed changes

Set use_neutron to 'true' by default 

Set "use_neutron" to 'true'. If "use_neutron" is set to 'false'
'networking/driver' is set to nova which is deprecated.
Also added releasenote for this.

Change-Id: I90315e2c1477392439bf293c0cda6453d587396e
This commit is contained in:
yatin 2017-05-04 15:58:29 +05:30
parent 4c3d399a63
commit d290751edc
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -161,7 +161,7 @@
#
# [*use_neutron*]
# (Optional) Whether to use neutron
# Defaults to false
# Defaults to true
#
# [*external_network*]
# (Optional) Name of the external Neutron network which will be used
@ -316,7 +316,7 @@ class murano(
$cert_file = $::os_service_default,
$key_file = $::os_service_default,
$ca_file = $::os_service_default,
$use_neutron = false,
$use_neutron = true,
$external_network = $::murano::params::default_external_network,
$default_router = $::os_service_default,
$default_nameservers = $::os_service_default,
@ -389,7 +389,7 @@ deprecated. Please use murano::default_transport_url instead.")
}
if $use_neutron {
if is_service_default($default_router) {
if !$default_router {
fail('The default_router parameter is required when use_neutron is set to true')
}
murano_config {

4
releasenotes/notes/fix_use_neutron-281638824d52ff8d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Change 'use_neutron' to true. Use Neutron as Nova network is
deprecated.

4
spec/classes/murano_init_spec.rb
View File

@ -64,7 +64,9 @@ describe 'murano' do
it { is_expected.to contain_murano_config('rabbitmq/ssl').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('networking/default_dns').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_murano_config('networking/driver').with_value('nova') }
it { is_expected.to contain_murano_config('networking/driver').with_value('neutron') }
it { is_expected.to contain_murano_config('networking/create_router').with_value(true) }
it { is_expected.to contain_murano_config('networking/external_network').with_value('public') }
it { is_expected.to contain_murano_config('keystone_authtoken/auth_uri').with_value('http://127.0.0.1:5000') }
it { is_expected.to contain_murano_config('keystone_authtoken/admin_user').with_value('murano') }