:git => 'https://github.com/cristifalcas/puppet-etcd',
:ref => '1.10.0'
+mod 'fdio',
+ :git => 'https://git.fd.io/puppet-fdio',
+ :ref => 'master'
+
mod 'ntp',
:git => 'https://github.com/puppetlabs/puppetlabs-ntp',
:ref => '4.2.x'
--- /dev/null
+module Puppet::Parser::Functions
+ newfunction(:honeycomb_int_role_mapping, :type => :rvalue, :doc => "Convert Honeycomb role mapping from kernel nic name (eth1) to VPP name (GigabitEthernet0/7/0).") do |arg|
+ mapping_list = arg[0]
+ mapping_list.map! do |item|
+ mapping = item.split(':')
+ unless mapping.length == 2
+ raise Puppet::ParseError, "Invalid physnet mapping format: #{item}. Expecting 'interface_name:role_name'"
+ end
+ if defined? call_function
+ vpp_int = call_function('hiera', [mapping[0]])
+ else
+ vpp_int = function_hiera([mapping[0]])
+ end
+ if vpp_int.to_s.strip.empty?
+ raise Puppet::ParseError, "VPP interface mapped to #{mapping[0]} is not found."
+ end
+ vpp_int+':'+mapping[1]
+ end
+ return mapping_list
+ end
+end
--- /dev/null
+# 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::honeycomb
+#
+# Honeycomb Neutron agent profile
+#
+# Honeycomb is a java-based agent that runs on the same host as a VPP
+# instance, and exposes yang models via netconf or restconf to allow
+# remote management of that VPP instance.
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step of the deployment
+# Defaults to hiera('step')
+#
+# [*interface_role_mapping*]
+# (Optional) VPP interface role mapping, note that the interface name
+# specified here is a kernel interface name that is bound to VPP.
+# Defaults to []
+#
+class tripleo::profile::base::neutron::agents::honeycomb (
+ $step = hiera('step'),
+ $interface_role_mapping = [],
+) {
+ if $step >= 4 {
+ class { '::fdio::honeycomb':
+ interface_role_map => honeycomb_int_role_mapping($interface_role_mapping),
+ }
+ }
+}
--- /dev/null
+# 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
+#
+# [*physnet_mapping*]
+# (Optional) physnet mapping, example: 'datacentre:eth1'. Note that the
+# interface specified here is a kernel interface name that is bound to
+# VPP.
+# Defaults to []
+#
+# [*type_drivers*]
+# (optional) List of network type driver entrypoints to be loaded
+# Could be an array that can contain flat, vlan or vxlan
+# Defaults to hiera('neutron::plugins::ml2::type_drivers', undef)
+#
+class tripleo::profile::base::neutron::agents::vpp(
+ $step = hiera('step'),
+ $etcd_host = hiera('etcd_vip'),
+ $etcd_port = 2379,
+ $physnet_mapping = [],
+ $type_drivers = hiera('neutron::plugins::ml2::type_drivers', undef),
+) {
+ 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,
+ physnets => vpp_physnet_mapping($physnet_mapping),
+ type_drivers => $type_drivers,
+ }
+ }
+}
$node_name = hiera('bootstack_nodeid')
) {
- if $step >= 1 {
+ if $step == 1 {
validate_array($odl_api_ips)
if empty($odl_api_ips) {
fail('No IPs assigned to OpenDaylight Api Service')
include ::neutron::plugins::ml2::fujitsu
include ::neutron::plugins::ml2::fujitsu::fossw
}
+
+ if 'vpp' in $mechanism_drivers {
+ include ::tripleo::profile::base::neutron::plugins::ml2::vpp
+ }
}
}
--- /dev/null
+# 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,
+ }
+ }
+}
--- /dev/null
+# 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::vpp
+#
+# vpp profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::vpp (
+ $step = hiera('step'),
+) {
+ if $step >= 1 {
+ include ::fdio
+ }
+}
--- /dev/null
+---
+features:
+ - |
+ Add profiles for VPP service. Vector Packet Processing (VPP) is a high
+ performance packet processing stack that runs in user space in Linux.
+ VPP is used as an alternative to kernel networking stack for accelerated
+ network data path.
--- /dev/null
+---
+features:
+ - Adds support for networking-vpp ML2 mechanism driver and agent.
Code Review / apex-puppet-tripleo.git / commitdiff