Cleanup ironic.conf template
This patch removes some deprecated options from ironic config file template in preparation to their removal from ironic itself: - remove SSH section, the SSH driver is no longer supported by ironic - remove [keystone] section altogether, the only option there is region_name which is deprecated, use it explicitly in [inspector] and [service_catalog] sections when keystone support is enabled - remove [conductor]api_url option, instead use [service_catalog]endpoint_override option - fix logic in [inspector] section templating, add keystoneauth options only when inspector itself is enabled. Change-Id: Ie4fd92ff2af6b300b0f6ceeaa40538a6c1176e6b
This commit is contained in:
parent
2074cc0db9
commit
a9b2cec215
|
@ -50,7 +50,6 @@ http_url = http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_inter
|
|||
http_root = {{ http_boot_folder }}
|
||||
|
||||
[conductor]
|
||||
api_url = http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:6385/
|
||||
clean_nodes = {{ cleaning | lower }}
|
||||
automated_clean = {{ cleaning | lower }}
|
||||
|
||||
|
@ -60,11 +59,6 @@ connection = mysql+pymysql://{{ ironic.database.username }}:{{ ironic.database.p
|
|||
[dhcp]
|
||||
dhcp_provider = none
|
||||
|
||||
{% if testing | bool == true %}
|
||||
[ssh]
|
||||
libvirt_uri = qemu:///system
|
||||
{% endif %}
|
||||
|
||||
{% if enable_cors | bool == true %}
|
||||
[cors]
|
||||
allowed_origin = {{ cors_allowed_origin | default('allowed_origin=http://localhost:8000') }}
|
||||
|
@ -77,7 +71,6 @@ use_web_server_for_images = true
|
|||
{% if enable_inspector | bool == true %}
|
||||
[inspector]
|
||||
enabled = true
|
||||
{% endif %}
|
||||
{% if enable_keystone is defined and enable_keystone | bool == true %}
|
||||
auth_type = password
|
||||
auth_url = {{ ironic.service_catalog.auth_url }}
|
||||
|
@ -86,14 +79,14 @@ password = {{ ironic.service_catalog.password }}
|
|||
user_domain_id = default
|
||||
project_name = {{ ironic.service_catalog.project_name }}
|
||||
project_domain_id = default
|
||||
region_name = {{ keystone.bootstrap.region_name | default('RegionOne')}}
|
||||
{% else %}
|
||||
auth_type=none
|
||||
endpoint_override=http://127.0.0.1:5050
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if enable_keystone is defined and enable_keystone | bool == true %}
|
||||
[keystone]
|
||||
region_name = {{ keystone.bootstrap.region_name | default('RegionOne')}}
|
||||
[keystone_authtoken]
|
||||
auth_plugin = password
|
||||
auth_url = {{ ironic.service_catalog.auth_url }}
|
||||
|
@ -102,11 +95,19 @@ password = {{ ironic.service_catalog.password }}
|
|||
user_domain_id = default
|
||||
project_name = {{ ironic.service_catalog.project_name }}
|
||||
project_domain_id = default
|
||||
{% endif %}
|
||||
|
||||
[service_catalog]
|
||||
{% if enable_keystone is defined and enable_keystone | bool == true %}
|
||||
auth_url = {{ ironic.service_catalog.auth_url }}
|
||||
auth_type = password
|
||||
tenant_name = {{ ironic.service_catalog.project_name }}
|
||||
project_name = {{ ironic.service_catalog.project_name }}
|
||||
username = {{ ironic.service_catalog.username }}
|
||||
password = {{ ironic.service_catalog.password }}
|
||||
user_domain_id = default
|
||||
project_domain_id = default
|
||||
region_name = {{ keystone.bootstrap.region_name | default('RegionOne')}}
|
||||
{% else %}
|
||||
auth_type = none
|
||||
endpoint_override = http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:6385
|
||||
{% endif %}
|
||||
|
|
Loading…
Reference in New Issue