From 737135ef496962cbef95cd5b3191df7949362865 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 4 Aug 2015 20:32:41 -0400 Subject: [PATCH] Prepare Liberty release Two patches in the same review, because they come together. 1) Upgrade acceptance manifest from Kilo (stable) to Liberty (dev) on both Ubuntu Trusty & Centos7. Also: 2) Support for configuring openvswitch_agent.ini Upstream Liberty Neutron now uses ml2/openvswitch_agent.ini to configure the neutron ML2 agent instead of openvswitch/ovs_neutron_plugin.ini. This patch updates all resources that configured the old file to use the newer version. This is required since neutron If6feca7b7a6bdd6c3c6feb929fa26fb4b1f72770 and should fix issues using puppet-neutron with the latest upstream packages. Depends-On: I7c1f31b3cc4c6ea1f894a263a8cff60e357accb8 Change-Id: If9fae3c83d606cb528f69ff54a28c046e0f7cc49 Co-Authored-By: Lukas Bezdicka Co-Authored-By: Dan Prince --- .../provider/neutron_agent_ovs/ini_setting.rb | 2 +- spec/acceptance/basic_neutron_spec.rb | 22 +++++++++++++++---- spec/classes/neutron_agents_ml2_ovs_spec.rb | 2 +- spec/classes/neutron_agents_ml2_sriov_spec.rb | 2 +- .../neutron_agent_ovs/ini_setting_spec.rb | 4 ++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb b/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb index b78fe092a..06b1fadfd 100644 --- a/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb +++ b/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb @@ -19,7 +19,7 @@ Puppet::Type.type(:neutron_agent_ovs).provide( if Facter['operatingsystem'].value == 'Ubuntu' '/etc/neutron/plugins/ml2/ml2_conf.ini' else - '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini' + '/etc/neutron/plugins/ml2/openvswitch_agent.ini' end end diff --git a/spec/acceptance/basic_neutron_spec.rb b/spec/acceptance/basic_neutron_spec.rb index e69a158d7..41b8e91cc 100644 --- a/spec/acceptance/basic_neutron_spec.rb +++ b/spec/acceptance/basic_neutron_spec.rb @@ -12,15 +12,29 @@ describe 'basic neutron' do case $::osfamily { 'Debian': { include ::apt - class { '::openstack_extras::repo::debian::ubuntu': - release => 'kilo', - package_require => true, + apt::ppa { 'ppa:ubuntu-cloud-archive/liberty-staging': + # it's false by default in 2.x series but true in 1.8.x + package_manage => false, } + Exec['apt_update'] -> Package<||> $package_provider = 'apt' } 'RedHat': { class { '::openstack_extras::repo::redhat::redhat': - release => 'kilo', + manage_rdo => false, + repo_hash => { + # we need kilo repo to be installed for dependencies + 'rdo-kilo' => { + 'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/', + 'descr' => 'RDO kilo', + 'gpgcheck' => 'no', + }, + 'rdo-liberty' => { + 'baseurl' => 'http://trunk.rdoproject.org/centos7/current/', + 'descr' => 'RDO trunk', + 'gpgcheck' => 'no', + }, + }, } package { 'openstack-selinux': ensure => 'latest' } $package_provider = 'yum' diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb index bc6a56252..33395d316 100644 --- a/spec/classes/neutron_agents_ml2_ovs_spec.rb +++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb @@ -39,7 +39,7 @@ describe 'neutron::agents::ml2::ovs' do it { is_expected.to contain_class('neutron::params') } - it 'configures ovs_neutron_plugin.ini' do + it 'configures plugins/ml2/openvswitch_agent.ini' do is_expected.to contain_neutron_agent_ovs('agent/polling_interval').with_value(p[:polling_interval]) is_expected.to contain_neutron_agent_ovs('agent/l2_population').with_value(p[:l2_population]) is_expected.to contain_neutron_agent_ovs('agent/arp_responder').with_value(p[:arp_responder]) diff --git a/spec/classes/neutron_agents_ml2_sriov_spec.rb b/spec/classes/neutron_agents_ml2_sriov_spec.rb index 9e384df17..a786fcf0a 100644 --- a/spec/classes/neutron_agents_ml2_sriov_spec.rb +++ b/spec/classes/neutron_agents_ml2_sriov_spec.rb @@ -33,7 +33,7 @@ describe 'neutron::agents::ml2::sriov' do it { is_expected.to contain_class('neutron::params') } - it 'configures ovs_neutron_plugin.ini' do + it 'configures plugins/ml2/openvswitch_agent.ini' do is_expected.to contain_neutron_plugin_ml2('sriov_nic/polling_interval').with_value(p[:polling_interval]) is_expected.to contain_neutron_plugin_ml2('sriov_nic/exclude_devices').with_value(p[:exclude_devices].join(',')) is_expected.to contain_neutron_plugin_ml2('sriov_nic/physical_device_mappings').with_value(p[:physical_device_mappings].join(',')) diff --git a/spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb b/spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb index 99851a958..5b70360f4 100644 --- a/spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb +++ b/spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb @@ -25,11 +25,11 @@ describe provider_class do [ 'RedHat', 'Debian' ].each do |os| context "on #{os} with default setting" do - it 'it should fall back to default and use ovs_neutron_plugin.ini' do + it 'it should fall back to default and use plugins/ml2/openvswitch_agent.ini' do Facter.fact(:operatingsystem).stubs(:value).returns("#{os}") expect(provider.section).to eq('DEFAULT') expect(provider.setting).to eq('foo') - expect(provider.file_path).to eq('/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini') + expect(provider.file_path).to eq('/etc/neutron/plugins/ml2/openvswitch_agent.ini') end end end