openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Revert "Fixes problem with kolla-kubernetes 3.0.2 images""

This commit is contained in:
Jenkins 2017-03-29 15:06:37 +00:00 committed by Gerrit Code Review
parent b39a18189b 30546d2d52
commit 04ebda9e44
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/nova/templates/nova.conf.j2
View File

@ -224,16 +224,13 @@ api_paste_config = /etc/nova/api-paste.ini
max_attempts = 10
discover_hosts_in_cells_interval = 60
# TODO(sdake): rework this hacky workaround after the placement API is
# implemented in the Kolla-kubernetes deliverable.
# In order to implement the placement API, the kolla-kubernetes
# deliverable needs the Kolla deliverable to release 4.0.0
# images to docker hub. See this blueprint for status:
# https://blueprints.launchpad.net/kolla-kubernetes/+spec/kolla-kubernetes-placement
{% if orchestration_engine != 'KUBERNETES' %}
[placement]
auth_type = password
{% if orchestration_engine == 'KUBERNETES' %}
auth_url = {{ keystone_admin_url }}
{% else %}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %}
username = {{ placement_keystone_user }}
password = {{ placement_keystone_password }}
user_domain_name = default
@ -241,4 +238,3 @@ project_name = service
project_domain_name = default
os_region_name = {{ openstack_region_name }}
os_interface = internal
{% endif %}