From ff0d1b76c349aac4bcfa36a040fcd06ced16e84b Mon Sep 17 00:00:00 2001 From: Andy Botting Date: Mon, 29 Aug 2016 14:16:22 +1000 Subject: [PATCH] Explicity set networking driver 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 --- manifests/init.pp | 2 ++ releasenotes/notes/network-driver-0ec3f27e3932f566.yaml | 3 +++ spec/classes/murano_init_spec.rb | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 releasenotes/notes/network-driver-0ec3f27e3932f566.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 01aab14..435aa3f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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'; } } diff --git a/releasenotes/notes/network-driver-0ec3f27e3932f566.yaml b/releasenotes/notes/network-driver-0ec3f27e3932f566.yaml new file mode 100644 index 0000000..58fbaa9 --- /dev/null +++ b/releasenotes/notes/network-driver-0ec3f27e3932f566.yaml @@ -0,0 +1,3 @@ +--- +features: + - Networking driver now explicitly set based on $use_neutron setting. diff --git a/spec/classes/murano_init_spec.rb b/spec/classes/murano_init_spec.rb index c440ee6..9ab4e56 100644 --- a/spec/classes/murano_init_spec.rb +++ b/spec/classes/murano_init_spec.rb @@ -54,6 +54,7 @@ describe 'murano' do it { is_expected.to contain_murano_config('rabbitmq/ssl').with_value('') } it { is_expected.to contain_murano_config('networking/default_dns').with_value('') } + 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') }