Merge "Prepare Liberty release"

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
 

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'

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])

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(','))

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