From 64fd8e17263a65275d9acdc5792193890face82f Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 29 Sep 2020 15:00:53 +0100
Subject: [PATCH] Disable overcloud networks for Ironic when unused
We do not need the workload provisioning, cleaning or inspection
networks when Ironic is disabled in the overcloud.
Change-Id: I300d0ef136224126f25d2c70a80a42afeea5f586
Story: 2008207
Task: 40992
---
ansible/group_vars/all/network | 6 +++---
.../notes/disable-ironic-networks-86ba35f58f317ab6.yaml | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 releasenotes/notes/disable-ironic-networks-86ba35f58f317ab6.yaml
diff --git a/ansible/group_vars/all/network b/ansible/group_vars/all/network
index 109fa90d6..998a2d823 100644
--- a/ansible/group_vars/all/network
+++ b/ansible/group_vars/all/network
@@ -15,11 +15,11 @@ provision_oc_net_name: 'provision_oc_net'
# Name of the network used by the overcloud hosts to manage the bare metal
# compute hosts via their out-of-band management controllers.
-oob_wl_net_name: 'oob_wl_net'
+oob_wl_net_name: "{{ 'oob_wl_net' if kolla_enable_ironic | bool else None }}"
# Name of the network used by the overcloud hosts to provision the bare metal
# workload hosts.
-provision_wl_net_name: 'provision_wl_net'
+provision_wl_net_name: "{{ 'provision_wl_net' if kolla_enable_ironic | bool else None }}"
# Name of the network used to expose the internal OpenStack API endpoints.
internal_net_name: 'internal_net'
@@ -57,7 +57,7 @@ swift_storage_replication_net_name: "{{ storage_mgmt_net_name }}"
# Name of the network used to perform hardware introspection on the bare metal
# workload hosts.
-inspection_net_name: 'inspection_net'
+inspection_net_name: "{{ 'inspection_net' if kolla_enable_ironic | bool else None }}"
# Name of the network used to perform cleaning on the bare metal workload
# hosts
diff --git a/releasenotes/notes/disable-ironic-networks-86ba35f58f317ab6.yaml b/releasenotes/notes/disable-ironic-networks-86ba35f58f317ab6.yaml
new file mode 100644
index 000000000..2530b44f3
--- /dev/null
+++ b/releasenotes/notes/disable-ironic-networks-86ba35f58f317ab6.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ The overcloud networks for Ironic (workload out-of-band, workload
+ provisioning, workload cleaning and workload inspection)
+ are now disabled by default if Ironic is not enabled.