From f9de6a025d4b986ed9461c67485f26fc953995c9 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 29 Sep 2020 14:34:15 +0100
Subject: [PATCH] Disable ironic in the overcloud by default
Ironic is now disabled by default in the overcloud. This brings Kayobe's
default set of services into line with Kolla Ansible. For environments
using Ironic in the overcloud, set kolla_enable_ironic to true in
kolla.yml.
Story: 2008207
Task: 40991
Change-Id: I33eb4fa534847e199a599350b525d4762a2beaac
---
ansible/group_vars/all/kolla | 2 +-
playbooks/kayobe-overcloud-base/overrides.yml.j2 | 3 +++
playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 | 3 +++
.../notes/default-disable-ironic-2c20b8a7e69f19c5.yaml | 7 +++++++
4 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/default-disable-ironic-2c20b8a7e69f19c5.yaml
diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index 88bf93c3..dee9ecea 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -494,7 +494,7 @@ kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}"
kolla_enable_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitty | bool }}"
kolla_enable_ironic_ipxe: "no"
-kolla_enable_ironic: "{{ kolla_enable_openstack_core | bool }}"
+kolla_enable_ironic: "no"
kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}"
kolla_enable_iscsid: "{{ (kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool) or kolla_enable_ironic | bool }}"
kolla_enable_karbor: "no"
diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2
index bea6e2e9..9e258083 100644
--- a/playbooks/kayobe-overcloud-base/overrides.yml.j2
+++ b/playbooks/kayobe-overcloud-base/overrides.yml.j2
@@ -25,6 +25,9 @@ pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple"
aio_bridge_ports:
- dummy1
+# Enable ironic for testing baremetal compute.
+kolla_enable_ironic: true
+
{% if tls_enabled %}
kolla_enable_tls_external: "yes"
kolla_enable_tls_internal: "yes"
diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2
index 9fec45fd..40e43cb1 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2
+++ b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2
@@ -26,3 +26,6 @@ pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple"
# are using for SSH to be removed. Use a dummy interface.
aio_bridge_ports:
- dummy1
+
+# Enable ironic for testing baremetal compute.
+kolla_enable_ironic: true
diff --git a/releasenotes/notes/default-disable-ironic-2c20b8a7e69f19c5.yaml b/releasenotes/notes/default-disable-ironic-2c20b8a7e69f19c5.yaml
new file mode 100644
index 00000000..0ee3d403
--- /dev/null
+++ b/releasenotes/notes/default-disable-ironic-2c20b8a7e69f19c5.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+ - |
+ Ironic is now disabled by default in the overcloud. This brings Kayobe's
+ default set of services into line with Kolla Ansible. For environments
+ using Ironic in the overcloud, set ``kolla_enable_ironic`` to ``true`` in
+ ``kolla.yml``.
--
GitLab