diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 9b4354297f..f718c7e05e 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -231,16 +231,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 @@ -248,4 +245,3 @@ project_name = service project_domain_name = default os_region_name = {{ openstack_region_name }} os_interface = internal -{% endif %}