From 4f5fea3b0f24ec1c1ead6ac21bbd951f2f374f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Tue, 15 Dec 2020 01:10:35 +0100
Subject: [PATCH] Baremetal deploy network ports support

Add '--network-ports' to the 'overcloud node provision'
command.

Include networks in overcloud_baremetal_deploy.yaml

Depends-On: https://review.opendev.org/765545
Depends-On: https://review.opendev.org/764493
Depends-On: https://review.opendev.org/764810
Depends-On: https://review.opendev.org/767068
Partial-Implements: blueprint network-data-v2-ports
Change-Id: If1247da749b248b2226cddfce545a51835e57419
---
 roles/overcloud-deploy/templates/overcloud-deploy.sh.j2  | 5 ++++-
 .../templates/overcloud_baremetal_deploy.yaml.j2         | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
index eaaf9450d..3988f5518 100644
--- a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
+++ b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
@@ -40,7 +40,10 @@ fi
 {% if baremetal_provision|bool %}
 ## * Provision the baremetal nodes
 ## ::
-openstack overcloud node provision --stack {{ stack_name }}  --output {{ working_dir }}/overcloud-baremetal-deployed.yaml {{ working_dir }}/overcloud_baremetal_deploy.yaml
+openstack overcloud node provision \
+  {% if network_provision|bool %}--network-ports{% endif %} \
+  --stack {{ stack_name }}  \
+  --output {{ working_dir }}/overcloud-baremetal-deployed.yaml {{ working_dir }}/overcloud_baremetal_deploy.yaml
 if [ $? -ne 0 ]; then
     exit 1
 fi
diff --git a/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2 b/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2
index 1262fb2d7..dda0a368b 100644
--- a/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2
+++ b/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2
@@ -1,12 +1,19 @@
 {% for role in topology_map %}
 {% set role_count = topology_map[role].scale |default(0) %}
 {% set role_profile = topology_map[role].flavor |default('') %}
+{% set role_networks = topology_map[role].networks |default([]) %}
 {% if role_count %}
 - name: {{ role }}
   count: {{ role_count }}
-{% if role_profile %}
+{% if role_profile or (role_networks and network_isolation and network_provision|bool) %}
   defaults:
+{% endif %}
+{% if role_profile %}
     profile: {{ role_profile }}
 {% endif %}
+{% if role_networks and network_isolation and network_provision|bool %}
+    networks:
+      {{ role_networks | to_nice_yaml(indent=2) | indent(6)}}
+{% endif %}
 {% endif %}
 {% endfor %}