openstack/puppet-murano
Code Issues Proposed changes

Explicity set networking driver

Browse Source 
A new config option has been added to Murano to explicitly set the
networking driver in
https://bugs.launchpad.net/murano/+bug/1617096

We have a config option for using Neutron, so we should set the
networking driver based on it.

Change-Id: Ic5fd668fecf90497cff6c595152cb379002f8d1c
This commit is contained in:
Andy Botting 2016-08-29 14:16:22 +10:00
parent c86b851ac1
commit ff0d1b76c3
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -356,10 +356,12 @@ class murano(
}
murano_config {
'networking/external_network': value => $external_network;
'networking/driver': value => 'neutron';
}
} else {
murano_config {
'networking/external_network': ensure => 'absent';
'networking/driver': value => 'nova';
}
}

3
releasenotes/notes/network-driver-0ec3f27e3932f566.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Networking driver now explicitly set based on $use_neutron setting.

2
spec/classes/murano_init_spec.rb
View File

@ -54,6 +54,7 @@ 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('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') }
@ -156,6 +157,7 @@ describe 'murano' do
it { is_expected.to contain_murano_config('networking/router_name').with_value('murano-router') }
it { is_expected.to contain_murano_config('networking/create_router').with_value(true) }
it { is_expected.to contain_murano_config('networking/default_dns').with_value('["8.8.8.8"]') }
it { is_expected.to contain_murano_config('networking/driver').with_value('neutron') }
it { is_expected.to contain_murano_config('ssl/cert_file').with_value('/etc/murano/murano.crt') }
it { is_expected.to contain_murano_config('ssl/key_file').with_value('/etc/murano/murano.key') }