From 6cb4507267e0a368a69c0ba1d02a6e16301ddf43 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sat, 11 Feb 2017 23:28:35 -0700 Subject: [PATCH] Fixes problem with kolla-kubernetes 3.0.2 images The kolla-kubernetes deliverable uses Newton images, however, the kolla-ansible 4.0.0 deliverable is targeted at Ocata. In Ocata, nova requires the placement API implementation. This change is transitory until genconfig is no longer required for kolla-kubernetes to operate. Change-Id: I1c192a01d91b4f507bafadb53b6abb1efdcdb46c Closes-Bug: #1663961 --- ansible/roles/nova/templates/nova.conf.j2 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 448d1e092f..920c242964 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -218,16 +218,20 @@ api_paste_config = /etc/nova/api-paste.ini [scheduler] max_attempts = 10 +# 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 project_name = service project_domain_name = default os_region_name = {{ openstack_region_name }} +{% endif %}