From 9475e05e30b031efce6a71eef4629c1a87ee327a Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 6 Apr 2020 16:45:25 +0100
Subject: [PATCH] Add kolla_enable_openstack_core variable

Adds a new variable, 'kolla_enable_openstack_core', which can be set a
default value for whether the default OpenStack services are enabled.
This includes Glance, Heat, Horizon, Ironic, Keystone, Neutron and Nova.
It is 'true' by default.

Change-Id: I7768d3a92272d4353522dbf1a96f124225f4d73d
Story: 2007524
Task: 39315
---
 ansible/group_vars/all/kolla                      | 15 ++++++++-------
 etc/kayobe/kolla.yml                              |  1 +
 ...la-enable-openstack-core-ce4866dd388f262e.yaml |  7 +++++++
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/kolla-enable-openstack-core-ce4866dd388f262e.yaml

diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index 97a898343..b6805d70a 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -357,18 +357,18 @@ kolla_enable_designate: "no"
 kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_freezer | bool or kolla_enable_osprofiler | bool or kolla_enable_skydive | bool or kolla_enable_monasca | bool else 'no' }}"
 kolla_enable_etcd: "no"
 kolla_enable_freezer: "no"
-kolla_enable_glance: "yes"
+kolla_enable_glance: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_grafana: "no"
 kolla_enable_gnocchi: "no"
 kolla_enable_haproxy: "yes"
-kolla_enable_heat: "yes"
-kolla_enable_horizon: "yes"
+kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
+kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_influxdb: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}"
-kolla_enable_ironic: "yes"
+kolla_enable_ironic: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_ironic_ipxe: "no"
 kolla_enable_ironic_neutron_agent: "{{ 'yes' if kolla_enable_neutron | bool and kolla_enable_ironic | bool else 'no' }}"
 kolla_enable_kafka: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}"
-kolla_enable_keystone: "yes"
+kolla_enable_keystone: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool  else 'no' }}"
 kolla_enable_magnum: "no"
 kolla_enable_manila: "no"
@@ -378,11 +378,12 @@ kolla_enable_mariabackup: "{{ kolla_enable_xtrabackup | default('no') }}"
 kolla_enable_mariadb: "yes"
 kolla_enable_monasca: "no"
 kolla_enable_murano: "no"
-kolla_enable_neutron: "yes"
+kolla_enable_neutron: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_neutron_lbaas: "no"
 kolla_enable_neutron_provider_networks: "no"
-kolla_enable_nova: "yes"
+kolla_enable_nova: "{{ kolla_enable_openstack_core | bool }}"
 kolla_enable_octavia: "no"
+kolla_enable_openstack_core: "yes"
 kolla_enable_osprofiler: "no"
 kolla_enable_prometheus: "no"
 kolla_enable_sahara: "no"
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 60ab7e4c4..db72d2507 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -236,6 +236,7 @@
 #kolla_enable_neutron_vpnaas:
 #kolla_enable_nova_serialconsole_proxy:
 #kolla_enable_octavia:
+#kolla_enable_openstack_core:
 #kolla_enable_osprofiler:
 #kolla_enable_panko:
 #kolla_enable_prometheus:
diff --git a/releasenotes/notes/kolla-enable-openstack-core-ce4866dd388f262e.yaml b/releasenotes/notes/kolla-enable-openstack-core-ce4866dd388f262e.yaml
new file mode 100644
index 000000000..494d1b930
--- /dev/null
+++ b/releasenotes/notes/kolla-enable-openstack-core-ce4866dd388f262e.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Adds a new variable, ``kolla_enable_openstack_core``, which can be set a
+    default value for whether the default OpenStack services are enabled. This
+    includes Glance, Heat, Horizon, Ironic, Keystone, Neutron and Nova. It is
+    ``true`` by default.