Browse Source

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

tags/8.5.1
Zuul 1 month ago
parent
commit
25ccb906a6

+ 36
- 0
manifests/profile/base/neutron/agents/networking_baremetal.pp View File

@@ -0,0 +1,36 @@
1
+# Copyright 2018 Red Hat, 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::agents::networking_baremetal
16
+#
17
+# ironic-neutron-agent profile for tripleo
18
+#
19
+# === Parameters
20
+#
21
+# [*step*]
22
+#   (Optional) The current step in deployment. See tripleo-heat-templates
23
+#   for more details.
24
+#   Defaults to hiera('step')
25
+#
26
+
27
+class tripleo::profile::base::neutron::agents::networking_baremetal(
28
+  $step               = Integer(hiera('step'))
29
+) {
30
+
31
+  include ::tripleo::profile::base::neutron
32
+
33
+  if $step >= 5 {
34
+    include ::neutron::agents::ml2::networking_baremetal
35
+  }
36
+}

+ 4
- 0
manifests/profile/base/neutron/plugins/ml2.pp View File

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

+ 36
- 0
manifests/profile/base/neutron/plugins/ml2/networking_baremetal.pp View File

@@ -0,0 +1,36 @@
1
+# Copyright 2018 Red Hat, 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::networking_baremetal
16
+#
17
+# Neutron networking-baremetal ML2 plugin profile for tripleo
18
+#
19
+# === Parameters
20
+#
21
+# [*step*]
22
+#   (Optional) The current step in deployment. See tripleo-heat-templates
23
+#   for more details.
24
+#   Defaults to hiera('step')
25
+#
26
+
27
+class tripleo::profile::base::neutron::plugins::ml2::networking_baremetal(
28
+  $step               = Integer(hiera('step'))
29
+) {
30
+
31
+  include ::tripleo::profile::base::neutron
32
+
33
+  if $step >= 4 {
34
+    include ::neutron::plugins::ml2::networking_baremetal
35
+  }
36
+}

+ 4
- 0
releasenotes/notes/ironic-networking-baremetal-ebb19eca5fa235bc.yaml View File

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

Loading…
Cancel
Save