diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-26 17:11:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-26 17:11:24 +0000 |
| commit | 6363c7eb1308a6e1d04e31e3987c09900759990f (patch) | |
| tree | 626f3295e4e925052deddd15334db885b528aa6f | |
| parent | 6fb514e06b402873a07fe1e1f2546521ead6f39b (diff) | |
| parent | 3c14ea2e0a6fede47984f95cf5c30a8e707d9df2 (diff) | |
| download | kolla-6363c7eb1308a6e1d04e31e3987c09900759990f.tar.gz kolla-6363c7eb1308a6e1d04e31e3987c09900759990f.zip | |
Merge "Fix configuration for ironic-conductor"
| -rw-r--r-- | ansible/roles/ironic/templates/ironic.conf.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index 63374c408..2fca544fc 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -9,6 +9,12 @@ admin_token = {{ keystone_admin_token }} host_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} {% endif %} +{% if service_name == 'ironic-conductor' %} +[conductor] +api_url = http://{{ kolla_internal_address }}:{{ ironic_api_port }} +clean_nodes = false +{% endif %} + [database] connection = mysql://{{ ironic_database_user }}:{{ ironic_database_password }}@{{ ironic_database_address }}/{{ ironic_database_name }} |