Merge "Add support for Ironic Networking Baremetal" into stable/queens

manifests/profile/base/neutron/agents/networking_baremetal.pp

@@ -0,0 +1,36 @@
+# Copyright 2018 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::networking_baremetal
+#
+# ironic-neutron-agent 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::neutron::agents::networking_baremetal(
+  $step               = Integer(hiera('step'))
+) {
+
+  include ::tripleo::profile::base::neutron
+
+  if $step >= 5 {
+    include ::neutron::agents::ml2::networking_baremetal
+  }
+}

manifests/profile/base/neutron/plugins/ml2.pp

@@ -105,5 +105,9 @@ class tripleo::profile::base::neutron::plugins::ml2 (
     if ('ansible' in $mechanism_drivers) and ('neutron_plugin_ml2_ansible' in $service_names) {
       include ::tripleo::profile::base::neutron::plugins::ml2::networking_ansible
     }
+
+    if 'baremetal' in $mechanism_drivers {
+      include ::tripleo::profile::base::neutron::plugins::ml2::networking_baremetal
+    }
   }
 }

manifests/profile/base/neutron/plugins/ml2/networking_baremetal.pp

@@ -0,0 +1,36 @@
+# Copyright 2018 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::networking_baremetal
+#
+# Neutron networking-baremetal ML2 plugin 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::neutron::plugins::ml2::networking_baremetal(
+  $step               = Integer(hiera('step'))
+) {
+
+  include ::tripleo::profile::base::neutron
+
+  if $step >= 4 {
+    include ::neutron::plugins::ml2::networking_baremetal
+  }
+}

releasenotes/notes/ironic-networking-baremetal-ebb19eca5fa235bc.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Adds support for Ironic Networking Baremetal. Networking Baremetal
+    is used to integrate the Bare Metal service with the Networking service.