summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 13:57:53 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 13:57:53 +0000
commit0c435d244feef24e83555e11badca2bd9381b505 (patch)
treea816984b6ad4a40d895fbb597170d6bb14acc99b
parent8ca7a1e390ce50ac66a6861dae59bb44fbf0324a (diff)
parentc70e68e65f806489d9d3f91d406bae82beaa3665 (diff)
Merge "Addition of Nuage as mechanism driver for ML2"
-rw-r--r--manifests/profile/base/neutron/plugins/ml2.pp4
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/nuage.pp31
2 files changed, 35 insertions, 0 deletions
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index f7a2935..1f440fa 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -85,5 +85,9 @@ class tripleo::profile::base::neutron::plugins::ml2 (
85 if 'vpp' in $mechanism_drivers { 85 if 'vpp' in $mechanism_drivers {
86 include ::tripleo::profile::base::neutron::plugins::ml2::vpp 86 include ::tripleo::profile::base::neutron::plugins::ml2::vpp
87 } 87 }
88
89 if 'nuage' in $mechanism_drivers {
90 include ::tripleo::profile::base::neutron::plugins::ml2::nuage
91 }
88 } 92 }
89} 93}
diff --git a/manifests/profile/base/neutron/plugins/ml2/nuage.pp b/manifests/profile/base/neutron/plugins/ml2/nuage.pp
new file mode 100644
index 0000000..e9608d0
--- /dev/null
+++ b/manifests/profile/base/neutron/plugins/ml2/nuage.pp
@@ -0,0 +1,31 @@
1# Copyright 2017 Nuage Networks from Nokia Inc.
2#
3# Licensed under the Apache License, Version 2.0 (the "License"); you may
4# not use this file except in compliance with the License. You may obtain
5# a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12# License for the specific language governing permissions and limitations
13# under the License.
14#
15# == Class: tripleo::profile::base::neutron::plugins::ml2::nuage
16#
17# Nuage Neutron ML2 profile for tripleo
18#
19# [*step*]
20# (Optional) The current step in deployment. See tripleo-heat-templates
21# for more details.
22# Defaults to hiera('step')
23#
24class tripleo::profile::base::neutron::plugins::ml2::nuage (
25 $step = hiera('step'),
26) {
27
28 if $step >= 4 {
29 include ::neutron::plugins::ml2::nuage
30 }
31}