Neutron: remove support for N1kv driver
... because N1kv driver was already removed[1]. [1]0730ec9e6b
Change-Id: Ie90f690ab80b4880b520f79b9c1ad528efa001eb (cherry picked from commit8310c55b08
)
This commit is contained in:
parent
24aa12a0b4
commit
a9777d238c
|
@ -87,13 +87,6 @@ class tripleo::profile::base::horizon (
|
||||||
include tripleo::profile::base::apache
|
include tripleo::profile::base::apache
|
||||||
include apache::mod::remoteip
|
include apache::mod::remoteip
|
||||||
|
|
||||||
if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers', undef) {
|
|
||||||
$_profile_support = 'cisco'
|
|
||||||
} else {
|
|
||||||
$_profile_support = 'None'
|
|
||||||
}
|
|
||||||
$neutron_options_real = merge({'profile_support' => $_profile_support }, $neutron_options)
|
|
||||||
|
|
||||||
if is_ipv6_address($memcached_ips[0]) {
|
if is_ipv6_address($memcached_ips[0]) {
|
||||||
$horizon_memcached_servers = prefix(any2array(normalize_ip_for_uri($memcached_ips)), 'inet6:')
|
$horizon_memcached_servers = prefix(any2array(normalize_ip_for_uri($memcached_ips)), 'inet6:')
|
||||||
|
|
||||||
|
@ -103,7 +96,7 @@ class tripleo::profile::base::horizon (
|
||||||
|
|
||||||
class { 'horizon':
|
class { 'horizon':
|
||||||
cache_server_ip => $horizon_memcached_servers,
|
cache_server_ip => $horizon_memcached_servers,
|
||||||
neutron_options => $neutron_options_real,
|
neutron_options => $neutron_options,
|
||||||
horizon_cert => $tls_certfile,
|
horizon_cert => $tls_certfile,
|
||||||
horizon_key => $tls_keyfile,
|
horizon_key => $tls_keyfile,
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
# Copyright 2016 Red Hat, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
#
|
|
||||||
# == Class: tripleo::profile::base::neutron::n1k
|
|
||||||
#
|
|
||||||
# Neutron N1k Mechanism Driver profile for tripleo
|
|
||||||
#
|
|
||||||
# === Parameters
|
|
||||||
#
|
|
||||||
# [*n1kv_source*]
|
|
||||||
# (Optional) The source location for the N1Kv
|
|
||||||
# Defaults to hiera('n1kv_vem_source', undef)
|
|
||||||
#
|
|
||||||
# [*n1kv_version*]
|
|
||||||
# (Optional) The version of N1Kv to use
|
|
||||||
# Defaults to hiera('n1kv_vem_version', undef)
|
|
||||||
#
|
|
||||||
# [*step*]
|
|
||||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
|
||||||
# for more details.
|
|
||||||
# Defaults to hiera('step')
|
|
||||||
#
|
|
||||||
class tripleo::profile::base::neutron::n1k (
|
|
||||||
$n1kv_source = hiera('n1kv_vem_source', undef),
|
|
||||||
$n1kv_version = hiera('n1kv_vem_version', undef),
|
|
||||||
$step = Integer(hiera('step')),
|
|
||||||
) {
|
|
||||||
include neutron::plugins::ml2::cisco::nexus1000v
|
|
||||||
include tripleo::profile::base::neutron
|
|
||||||
|
|
||||||
if $step >= 4 {
|
|
||||||
class { 'neutron::agents::n1kv_vem':
|
|
||||||
n1kv_source => $n1kv_source,
|
|
||||||
n1kv_version => $n1kv_version,
|
|
||||||
}
|
|
||||||
|
|
||||||
class { 'n1k_vsm':
|
|
||||||
n1kv_source => $n1kv_source,
|
|
||||||
n1kv_version => $n1kv_version,
|
|
||||||
pacemaker_control => false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -63,10 +63,6 @@ class tripleo::profile::base::neutron::plugins::ml2 (
|
||||||
include neutron::plugins::ml2::sriov_driver
|
include neutron::plugins::ml2::sriov_driver
|
||||||
}
|
}
|
||||||
|
|
||||||
if 'cisco_n1kv' in $mechanism_drivers {
|
|
||||||
include tripleo::profile::base::neutron::n1k
|
|
||||||
}
|
|
||||||
|
|
||||||
if 'cisco_ucsm' in $mechanism_drivers {
|
if 'cisco_ucsm' in $mechanism_drivers {
|
||||||
include neutron::plugins::ml2::cisco::ucsm
|
include neutron::plugins::ml2::cisco::ucsm
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue