Merge "Nova controller ironic section fix for AIO"
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index 87f80e2..b1b18d7 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -161,7 +161,7 @@
# * ``hyperv.HyperVDriver``
# (string value)
#compute_driver=<None>
-compute_driver=libvirt.LibvirtDriver
+compute_driver = {{ controller.get('compute_driver', 'libvirt.LibvirtDriver') }}
#
# Allow destination machine to match source for resize. Useful when
@@ -5518,6 +5518,7 @@
#filesystems =
+{% if controller.ironic is defined -%}
[ironic]
#
# Configuration options for Ironic driver (Bare Metal).
@@ -5535,7 +5536,7 @@
#
# URL override for the Ironic API endpoint. (string value)
-#api_endpoint=http://ironic.example.org:6385/
+api_endpoint={{ controller.ironic.get('protocol', 'http') }}://{{ controller.ironic.host }}:{{ controller.ironic.port }}
#
# The number of times to retry when a request conflicts.
@@ -5565,10 +5566,9 @@
# PEM encoded Certificate Authority to use when verifying HTTPs connections.
# (string value)
-#cafile=<None>
-
-# PEM encoded client certificate cert file (string value)
-#certfile=<None>
+{%- if controller.ironic.get('protocol', 'http') == 'https' %}
+cafile={{ controller.identity.get('cacert_file', controller.cacert_file) }}
+{%- endif %}
# PEM encoded client certificate key file (string value)
#keyfile=<None>
@@ -5581,13 +5581,13 @@
# Authentication type to load (string value)
# Deprecated group/name - [ironic]/auth_plugin
-#auth_type=<None>
+auth_type={{ controller.ironic.auth_type }}
# Config Section from which to load plugin specific options (string value)
#auth_section=<None>
# Authentication URL (string value)
-#auth_url=<None>
+auth_url={{ controller.identity.get('protocol', 'http') }}://{{ controller.identity.host }}:{{ controller.identity.port }}/v3
# Domain ID to scope to (string value)
#domain_id=<None>
@@ -5599,13 +5599,13 @@
#project_id=<None>
# Project name to scope to (string value)
-#project_name=<None>
+project_name={{ controller.identity.tenant }}
# Domain ID containing project (string value)
#project_domain_id=<None>
# Domain name containing project (string value)
-#project_domain_name=<None>
+project_domain_name={{ controller.ironic.project_domain_name }}
# Trust ID (string value)
#trust_id=<None>
@@ -5615,16 +5615,17 @@
# Username (string value)
# Deprecated group/name - [ironic]/user-name
-#username=<None>
+username={{ controller.ironic.user }}
# User's domain id (string value)
#user_domain_id=<None>
# User's domain name (string value)
-#user_domain_name=<None>
+user_domain_name={{ controller.ironic.user_domain_name }}
# User's password (string value)
-#password=<None>
+password={{ controller.ironic.password }}
+{%- endif %}
[key_manager]