Merge "Disable ironic in the overcloud by default"
This commit is contained in:
commit
d0d7f07c0b
|
@ -494,7 +494,7 @@ kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}"
|
||||||
kolla_enable_horizon: "{{ 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_influxdb: "{{ kolla_enable_monasca | bool or kolla_enable_cloudkitty | bool }}"
|
||||||
kolla_enable_ironic_ipxe: "no"
|
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_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_iscsid: "{{ (kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool) or kolla_enable_ironic | bool }}"
|
||||||
kolla_enable_karbor: "no"
|
kolla_enable_karbor: "no"
|
||||||
|
|
|
@ -25,6 +25,9 @@ pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple"
|
||||||
aio_bridge_ports:
|
aio_bridge_ports:
|
||||||
- dummy1
|
- dummy1
|
||||||
|
|
||||||
|
# Enable ironic for testing baremetal compute.
|
||||||
|
kolla_enable_ironic: true
|
||||||
|
|
||||||
{% if tls_enabled %}
|
{% if tls_enabled %}
|
||||||
kolla_enable_tls_external: "yes"
|
kolla_enable_tls_external: "yes"
|
||||||
kolla_enable_tls_internal: "yes"
|
kolla_enable_tls_internal: "yes"
|
||||||
|
|
|
@ -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.
|
# are using for SSH to be removed. Use a dummy interface.
|
||||||
aio_bridge_ports:
|
aio_bridge_ports:
|
||||||
- dummy1
|
- dummy1
|
||||||
|
|
||||||
|
# Enable ironic for testing baremetal compute.
|
||||||
|
kolla_enable_ironic: true
|
||||||
|
|
|
@ -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``.
|
Loading…
Reference in New Issue