diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-19 13:57:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-19 13:57:53 +0000 |
commit | 0c435d244feef24e83555e11badca2bd9381b505 (patch) | |
tree | a816984b6ad4a40d895fbb597170d6bb14acc99b | |
parent | 8ca7a1e390ce50ac66a6861dae59bb44fbf0324a (diff) | |
parent | c70e68e65f806489d9d3f91d406bae82beaa3665 (diff) |
Merge "Addition of Nuage as mechanism driver for ML2"
-rw-r--r-- | manifests/profile/base/neutron/plugins/ml2.pp | 4 | ||||
-rw-r--r-- | manifests/profile/base/neutron/plugins/ml2/nuage.pp | 31 |
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 ( if 'vpp' in $mechanism_drivers { include ::tripleo::profile::base::neutron::plugins::ml2::vpp } + + if 'nuage' in $mechanism_drivers { + include ::tripleo::profile::base::neutron::plugins::ml2::nuage + } } } 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 @@ +# Copyright 2017 Nuage Networks from Nokia 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::plugins::ml2::nuage +# +# Nuage Neutron ML2 profile for tripleo +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::plugins::ml2::nuage ( + $step = hiera('step'), +) { + + if $step >= 4 { + include ::neutron::plugins::ml2::nuage + } +} |