Remove support for Nuage core plugin
... because it was deprecated during Yoga cycle[1].
Actual plugin implementation was already removed so it is just of no
use.
[1] a1429c245c
Change-Id: Iad5c3e5bbb207c672780140b4801baaade8b5a5f
This commit is contained in:
Takashi Kajinami
parent
03396ad2fb
commit
03d2bc2d2b
@ -24,14 +24,6 @@
|
||||
# [*core_plugin*]
|
||||
# (optional) Neutron plugin provider
|
||||
# Defaults to ml2
|
||||
# Could be brocade, embrane, hyperv, ml2, mlnx, nec, ryu, nuage,
|
||||
# opencontrail, nsx
|
||||
#
|
||||
# Example for nuage:
|
||||
#
|
||||
# class {'neutron' :
|
||||
# core_plugin => 'nuage'
|
||||
# }
|
||||
#
|
||||
# [*service_plugins*]
|
||||
# (optional) Advanced service modules.
|
||||
|
||||
@ -1,112 +0,0 @@
|
||||
# DEPRECATED !!
|
||||
# Configure the Nuage plugin for neutron.
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*nuage_net_partition_name*]
|
||||
# (required) The net partition under which the VMs will be
|
||||
# seen in the VSD
|
||||
#
|
||||
# [*nuage_vsd_ip*]
|
||||
# (required) IP address of the Virtual Services Directory
|
||||
#
|
||||
# [*nuage_vsd_username*]
|
||||
# (required) Username to be used to log into VSD
|
||||
#
|
||||
# [*nuage_vsd_password*]
|
||||
# (required) Password to be used to log into VSD
|
||||
#
|
||||
# [*nuage_vsd_organization*]
|
||||
# (required) Parameter required to log into VSD
|
||||
#
|
||||
# [*nuage_base_uri_version*]
|
||||
# (required) URI version to be used based on the VSD release
|
||||
# For example v3_0
|
||||
#
|
||||
# [*nuage_cms_id*]
|
||||
# (required) CMS ID generated by the VSD
|
||||
#
|
||||
# [*nuage_auth_resource*]
|
||||
# (optional) The auth resource value to be use to connect
|
||||
# to VSD. The default is /me
|
||||
#
|
||||
# [*nuage_server_ssl*]
|
||||
# (optional) Flag to determine whether to use ssl connection
|
||||
# to connect to VSD. The default is True
|
||||
#
|
||||
# [*purge_config*]
|
||||
# (optional) Whether to set only the specified config options
|
||||
# in the nuage config.
|
||||
# Defaults to false.
|
||||
#
|
||||
class neutron::plugins::nuage (
|
||||
$nuage_net_partition_name,
|
||||
$nuage_vsd_ip,
|
||||
$nuage_vsd_username,
|
||||
$nuage_vsd_password,
|
||||
$nuage_vsd_organization,
|
||||
$nuage_base_uri_version,
|
||||
$nuage_cms_id,
|
||||
$nuage_auth_resource = '/me',
|
||||
$nuage_server_ssl = true,
|
||||
$purge_config = false,
|
||||
) {
|
||||
|
||||
include neutron::deps
|
||||
include neutron::params
|
||||
|
||||
warning('Support for Nuage core plugin has been deprecated. Use Nuage ml2 plugin.')
|
||||
|
||||
file { '/etc/neutron/plugins/nuage':
|
||||
ensure => directory,
|
||||
tag => 'neutron-config-file',
|
||||
}
|
||||
|
||||
if $::osfamily == 'Debian' {
|
||||
file_line { '/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG':
|
||||
path => '/etc/default/neutron-server',
|
||||
match => '^NEUTRON_PLUGIN_CONFIG=(.*)$',
|
||||
line => "NEUTRON_PLUGIN_CONFIG=${::neutron::params::nuage_config_file}",
|
||||
tag => 'neutron-file-line',
|
||||
}
|
||||
}
|
||||
|
||||
if $::osfamily == 'Redhat' {
|
||||
file { '/etc/neutron/plugin.ini':
|
||||
ensure => link,
|
||||
require => File['/etc/neutron/plugins/nuage/plugin.ini'],
|
||||
target => $::neutron::params::nuage_config_file,
|
||||
tag => 'neutron-config-file',
|
||||
}
|
||||
}
|
||||
|
||||
file { '/etc/neutron/plugins/nuage/plugin.ini':
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => $::neutron::params::group,
|
||||
require => File['/etc/neutron/plugins/nuage'],
|
||||
mode => '0640',
|
||||
tag => 'neutron-config-file',
|
||||
}
|
||||
|
||||
resources { 'neutron_plugin_nuage':
|
||||
purge => $purge_config,
|
||||
}
|
||||
|
||||
$nuage_base_uri_base = '/nuage/api'
|
||||
neutron_plugin_nuage {
|
||||
'RESTPROXY/default_net_partition_name': value => $nuage_net_partition_name;
|
||||
'RESTPROXY/server': value => $nuage_vsd_ip;
|
||||
'RESTPROXY/serverauth': value => "${nuage_vsd_username}:${nuage_vsd_password}";
|
||||
'RESTPROXY/organization': value => $nuage_vsd_organization;
|
||||
'RESTPROXY/auth_resource': value => $nuage_auth_resource;
|
||||
'RESTPROXY/serverssl': value => $nuage_server_ssl;
|
||||
'RESTPROXY/base_uri': value => "${nuage_base_uri_base}/${nuage_base_uri_version}";
|
||||
'RESTPROXY/cms_id': value => $nuage_cms_id;
|
||||
}
|
||||
|
||||
if ($::neutron::core_plugin != 'nuage_neutron.plugins.nuage.plugin.NuagePlugin') and
|
||||
($::neutron::core_plugin != 'nuage') {
|
||||
fail('Nuage plugin should be the core_plugin in neutron.conf')
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
Support for Nuage core plugin ha sbeen removed.
|
||||
@ -1,97 +0,0 @@
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'neutron::plugins::nuage' do
|
||||
let :pre_condition do
|
||||
"class { 'neutron':
|
||||
core_plugin => 'nuage_neutron.plugins.nuage.plugin.NuagePlugin' }
|
||||
class { 'neutron::keystone::authtoken':
|
||||
password => 'passw0rd',
|
||||
}
|
||||
class { 'neutron::server': }"
|
||||
end
|
||||
|
||||
let :params do
|
||||
{
|
||||
:nuage_vsd_ip => %w(192.168.33.3),
|
||||
:nuage_vsd_username => 'test',
|
||||
:nuage_vsd_password => 'test',
|
||||
:nuage_vsd_organization => 'vsd',
|
||||
:nuage_net_partition_name => 'test',
|
||||
:nuage_base_uri_version => 'v3.0',
|
||||
:nuage_cms_id => '7488fae2-7e51-11e5-8bcf-feff819cdc9f',
|
||||
:purge_config => false,
|
||||
}
|
||||
end
|
||||
|
||||
shared_examples 'neutron plugin nuage' do
|
||||
it { should contain_class('neutron::params') }
|
||||
|
||||
it 'should have a nuage plugin ini file' do
|
||||
should contain_file('/etc/neutron/plugins/nuage/plugin.ini').with(
|
||||
:ensure => 'file',
|
||||
:owner => 'root',
|
||||
:group => 'neutron',
|
||||
:mode => '0640'
|
||||
)
|
||||
end
|
||||
|
||||
it 'should configure neutron.conf' do
|
||||
should contain_neutron_config('DEFAULT/core_plugin').with_value('nuage_neutron.plugins.nuage.plugin.NuagePlugin')
|
||||
end
|
||||
|
||||
it 'passes purge to resource' do
|
||||
should contain_resources('neutron_plugin_nuage').with({
|
||||
:purge => false
|
||||
})
|
||||
end
|
||||
|
||||
it 'should configure plugin.ini' do
|
||||
should contain_neutron_plugin_nuage('RESTPROXY/default_net_partition_name').with_value(params[:nuage_net_partition_name])
|
||||
should contain_neutron_plugin_nuage('RESTPROXY/server').with_value(params[:nuage_vsd_ip])
|
||||
should contain_neutron_plugin_nuage('RESTPROXY/organization').with_value(params[:nuage_vsd_organization])
|
||||
should contain_neutron_plugin_nuage('RESTPROXY/cms_id').with_value(params[:nuage_cms_id])
|
||||
end
|
||||
|
||||
context 'configure nuage with wrong core_plugin configure' do
|
||||
let :pre_condition do
|
||||
"class { 'neutron':
|
||||
core_plugin => 'foo' }"
|
||||
end
|
||||
|
||||
it { should raise_error(Puppet::Error, /Nuage plugin should be the core_plugin in neutron.conf/) }
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'neutron::plugin::nuage on Debian' do
|
||||
it 'configures /etc/default/neutron-server' do
|
||||
should contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').with(
|
||||
:path => '/etc/default/neutron-server',
|
||||
:match => '^NEUTRON_PLUGIN_CONFIG=(.*)$',
|
||||
:line => 'NEUTRON_PLUGIN_CONFIG=/etc/neutron/plugins/nuage/plugin.ini',
|
||||
)
|
||||
should contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').that_requires('Anchor[neutron::config::begin]')
|
||||
should contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').that_notifies('Anchor[neutron::config::end]')
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples 'neutron::plugin::nuage on RedHat' do
|
||||
it 'should create plugin symbolic link' do
|
||||
should contain_file('/etc/neutron/plugin.ini').with(
|
||||
:ensure => 'link',
|
||||
:target => '/etc/neutron/plugins/nuage/plugin.ini')
|
||||
end
|
||||
end
|
||||
|
||||
on_supported_os({
|
||||
:supported_os => OSDefaults.get_supported_os
|
||||
}).each do |os,facts|
|
||||
context "on #{os}" do
|
||||
let (:facts) do
|
||||
facts.merge!(OSDefaults.get_facts())
|
||||
end
|
||||
|
||||
it_behaves_like 'neutron plugin nuage'
|
||||
it_behaves_like "neutron::plugin::nuage on #{facts[:osfamily]}"
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue
Block a user