aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-07 17:32:58 +0000
committerGerrit Code Review <review@openstack.org>2017-04-07 17:32:58 +0000
commit31a065dd58a704f3bc8f4959202ac7dea2fcf29e (patch)
tree60adaa8240b41dc8d135bf2889646ca250653281 /manifests
parentd8273a48609bb0babab225b5d0e7b63e246b999e (diff)
parent8fa4f7c87f568748a8afd6795cf839707a5e27ff (diff)
Merge "Add networking-vpp ML2 mechanism driver support"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/neutron/agents/vpp.pp49
-rw-r--r--manifests/profile/base/neutron/plugins/ml2.pp4
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/vpp.pp49
3 files changed, 102 insertions, 0 deletions
diff --git a/manifests/profile/base/neutron/agents/vpp.pp b/manifests/profile/base/neutron/agents/vpp.pp
new file mode 100644
index 0000000..e961aa7
--- /dev/null
+++ b/manifests/profile/base/neutron/agents/vpp.pp
@@ -0,0 +1,49 @@
+# Copyright 2017 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::agents::vpp
+#
+# Neutron VPP Agent profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+# [*etcd_host*]
+# (Optional) etcd server VIP.
+# Defaults to hiera('etcd_vip')
+#
+# [*etcd_port*]
+# (Optional) etcd server listening port.
+# Defaults to 2379
+#
+class tripleo::profile::base::neutron::agents::vpp(
+ $step = hiera('step'),
+ $etcd_host = hiera('etcd_vip'),
+ $etcd_port = 2379,
+) {
+ if empty($etcd_host) {
+ fail('etcd_vip not set in hieradata')
+ }
+
+ if $step >= 4 {
+ class { '::neutron::agents::ml2::vpp':
+ etcd_host => $etcd_host,
+ etcd_port => $etcd_port,
+ }
+ }
+}
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 52d4ca1..1702fed 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -81,5 +81,9 @@ class tripleo::profile::base::neutron::plugins::ml2 (
include ::neutron::plugins::ml2::fujitsu
include ::neutron::plugins::ml2::fujitsu::fossw
}
+
+ if 'vpp' in $mechanism_drivers {
+ include ::tripleo::profile::base::neutron::plugins::ml2::vpp
+ }
}
}
diff --git a/manifests/profile/base/neutron/plugins/ml2/vpp.pp b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
new file mode 100644
index 0000000..217e4cf
--- /dev/null
+++ b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
@@ -0,0 +1,49 @@
+# Copyright 2017 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::plugins::ml2::vpp
+#
+# VPP Neutron ML2 profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+# [*etcd_host*]
+# (Optional) etcd server VIP.
+# Defaults to hiera('etcd_vip')
+#
+# [*etcd_port*]
+# (Optional) etcd server listening port.
+# Defaults to 2379
+#
+class tripleo::profile::base::neutron::plugins::ml2::vpp (
+ $step = hiera('step'),
+ $etcd_host = hiera('etcd_vip'),
+ $etcd_port = 2379,
+) {
+ if empty($etcd_host) {
+ fail('etcd_vip not set in hieradata')
+ }
+
+ if $step >= 4 {
+ class { '::neutron::plugins::ml2::vpp':
+ etcd_host => $etcd_host,
+ etcd_port => $etcd_port,
+ }
+ }
+}