Commit 96b98edd authored by Andy McCrae's avatar Andy McCrae
Browse files

Fix ironic_api_url value

The api_url value is wrong and causes gate failures now that the value
is tested by the ironic server when it starts up.

Change-Id: I7d63135a74b6472a284495f04d7c04dc553f53ad
parent 35e96e72
......@@ -117,7 +117,7 @@ ironic_enabled_network_interfaces_list: "flat,noop{{ (ironic_neutron_provisionin
ironic_default_network_interface: "{{ (ironic_neutron_provisioning_network_uuid is defined) | ternary('neutron','flat') }}"
ironic_openstack_driver_list: agent_ipmitool
ironic_openstack_auth_strategy: keystone
ironic_openstack_api_url: '' # Not required when we have keystone
#ironic_openstack_api_url: '' # Not required when we have keystone
ironic_openstack_dhcp_provider: neutron
ironic_openstack_sync_power_state_interval: 60
ironic_openstack_db_connection_string: "mysql+pymysql://{{ ironic_galera_user }}:{{ ironic_container_mysql_password }}@{{ ironic_galera_address }}/ironic"
......@@ -125,7 +125,7 @@ ironic_openstack_db_connection_string: "mysql+pymysql://{{ ironic_galera_user }}
# Standalone Ironic configuration
ironic_standalone_driver_list: agent_ipmitool
ironic_standalone_auth_strategy: noauth
ironic_standalone_api_url: "api_url={{ ironic_service_internaluri }}/"
ironic_standalone_api_url: "{{ ironic_service_internaluri }}/"
ironic_standalone_dhcp_provider: none
ironic_standalone_sync_power_state_interval: -1
ironic_standalone_db_connection_string: "mysql+pymysql://{{ ironic_galera_user }}:{{ ironic_container_mysql_password }}@{{ ironic_galera_address }}/ironic"
......
......@@ -29,7 +29,7 @@
set_fact:
ironic_driver_list: "{{ ironic_openstack_driver_list }}"
ironic_auth_strategy: "{{ ironic_openstack_auth_strategy }}"
ironic_api_url: "{{ ironic_openstack_api_url }}"
ironic_api_url: "{{ ironic_openstack_api_url | default(omit) }}"
ironic_dhcp_provider: "{{ ironic_openstack_dhcp_provider }}"
ironic_sync_power_state_interval: "{{ ironic_openstack_sync_power_state_interval }}"
ironic_db_connection_string: "{{ ironic_openstack_db_connection_string }}"
......
......@@ -24,7 +24,9 @@ default_network_interface = {{ ironic_default_network_interface }}
[cisco_ucs]
[conductor]
{% if ironic_api_url is defined %}
api_url = {{ ironic_api_url }}
{% endif %}
sync_power_state_interval = {{ ironic_sync_power_state_interval }}
automated_clean = {{ ironic_automated_clean }}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment