openstack/kolla-ansible
Code Issues Proposed changes

Changing ironic-inspector configuration for kolla-kubernetes

Browse Source 
Changing ironic-inspector configuration for kolla-kubernetes

Change-Id: Ib1ff99d2d58ca9f910b8e68e6076359e2e7ec5a0
Closes-Bug: #1664726
This commit is contained in:
Serguei Bezverkhi 2017-02-14 16:48:50 -05:00
parent dd79b8d1d3
commit 35fee342f0
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ansible/roles/ironic/templates/ironic-inspector.conf.j2
View File

@ -2,11 +2,19 @@
debug = {{ ironic_logging_debug }} debug = {{ ironic_logging_debug }}
log_dir = /var/log/kolla/ironic log_dir = /var/log/kolla/ironic
{% if orchestration_engine != 'KUBERNETES' %}
listen_address = {{ api_interface_address }} listen_address = {{ api_interface_address }}
{% else %}
listen_address = 0.0.0.0
{% endif %}
listen_port = {{ ironic_inspector_port }} listen_port = {{ ironic_inspector_port }}
[ironic] [ironic]
{% if orchestration_engine == 'KUBERNETES' %}
auth_url = {{ keystone_admin_url }}
{% else %}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %}
auth_type = password auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
@ -15,8 +23,13 @@ username = {{ ironic_inspector_keystone_user }}
password = {{ ironic_inspector_keystone_password }} password = {{ ironic_inspector_keystone_password }}
[keystone_authtoken] [keystone_authtoken]
{% if orchestration_engine == 'KUBERNETES' %}
auth_uri = {{ keystone_internal_url }}
auth_url = {{ keystone_admin_url }}
{% else %}
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %}
auth_type = password auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
@ -26,10 +39,18 @@ password = {{ ironic_inspector_keystone_password }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
{% if orchestration_engine == 'KUBERNETES' %}
memcache_servers = {{ memcached_servers }}
{% else %}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
{%- endif %}
[firewall] [firewall]
{% if orchestration_engine == 'KUBERNETES' %}
dnsmasq_interface = undefined
{% else %}
dnsmasq_interface = {{ ironic_dnsmasq_interface }} dnsmasq_interface = {{ ironic_dnsmasq_interface }}
{%- endif %}
[database] [database]
connection = mysql+pymysql://{{ ironic_inspector_database_user }}:{{ ironic_inspector_database_password }}@{{ ironic_inspector_database_address }}/{{ ironic_inspector_database_name }} connection = mysql+pymysql://{{ ironic_inspector_database_user }}:{{ ironic_inspector_database_password }}@{{ ironic_inspector_database_address }}/{{ ironic_inspector_database_name }}