Merge "Add kolla_enable_openstack_core variable"

This commit is contained in:
Zuul 2020-04-23 23:44:32 +00:00 committed by Gerrit Code Review
commit 6afc813c83
3 changed files with 16 additions and 7 deletions

View File

@ -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_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_etcd: "no"
kolla_enable_freezer: "no" kolla_enable_freezer: "no"
kolla_enable_glance: "yes" kolla_enable_glance: "{{ kolla_enable_openstack_core | bool }}"
kolla_enable_grafana: "no" kolla_enable_grafana: "no"
kolla_enable_gnocchi: "no" kolla_enable_gnocchi: "no"
kolla_enable_haproxy: "yes" kolla_enable_haproxy: "yes"
kolla_enable_heat: "yes" kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
kolla_enable_horizon: "yes" kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}"
kolla_enable_influxdb: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}" 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_ipxe: "no"
kolla_enable_ironic_neutron_agent: "{{ 'yes' if kolla_enable_neutron | bool and kolla_enable_ironic | bool else '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_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_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}"
kolla_enable_magnum: "no" kolla_enable_magnum: "no"
kolla_enable_manila: "no" kolla_enable_manila: "no"
@ -378,11 +378,12 @@ kolla_enable_mariabackup: "{{ kolla_enable_xtrabackup | default('no') }}"
kolla_enable_mariadb: "yes" kolla_enable_mariadb: "yes"
kolla_enable_monasca: "no" kolla_enable_monasca: "no"
kolla_enable_murano: "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_lbaas: "no"
kolla_enable_neutron_provider_networks: "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_octavia: "no"
kolla_enable_openstack_core: "yes"
kolla_enable_osprofiler: "no" kolla_enable_osprofiler: "no"
kolla_enable_prometheus: "no" kolla_enable_prometheus: "no"
kolla_enable_sahara: "no" kolla_enable_sahara: "no"

View File

@ -236,6 +236,7 @@
#kolla_enable_neutron_vpnaas: #kolla_enable_neutron_vpnaas:
#kolla_enable_nova_serialconsole_proxy: #kolla_enable_nova_serialconsole_proxy:
#kolla_enable_octavia: #kolla_enable_octavia:
#kolla_enable_openstack_core:
#kolla_enable_osprofiler: #kolla_enable_osprofiler:
#kolla_enable_panko: #kolla_enable_panko:
#kolla_enable_prometheus: #kolla_enable_prometheus:

View File

@ -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.