Fix broken gate due to kolla-ansible change
Jeffrey merged change: I33a0b8ba4ca69e5e34edb11248fb614a5a913f65 So this patch: 0001-Revert-Fixes-problem-with-kolla-kubernetes-3.0.2-ima.patch is not needed. Change-Id: If53606c7cf0ae55c5f0681486446d49f29350f2e
This commit is contained in:
parent
8acb3ba322
commit
81f8621dd6
|
@ -1,45 +0,0 @@
|
|||
From 3b93771ee92690b473afbbf464faa625f6e35f85 Mon Sep 17 00:00:00 2001
|
||||
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
|
||||
Date: Fri, 10 Mar 2017 23:24:40 +0800
|
||||
Subject: [PATCH] Revert "Fixes problem with kolla-kubernetes 3.0.2 images"
|
||||
|
||||
This reverts commit 6cb4507267e0a368a69c0ba1d02a6e16301ddf43.
|
||||
|
||||
Change-Id: I33a0b8ba4ca69e5e34edb11248fb614a5a913f65
|
||||
---
|
||||
ansible/roles/nova/templates/nova.conf.j2 | 12 ++++--------
|
||||
1 file changed, 4 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
|
||||
index 9b43542..f718c7e 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 %}
|
||||
--
|
||||
1.8.3.1
|
||||
|
|
@ -55,17 +55,6 @@ EOF
|
|||
openstack/kolla-ansible && true
|
||||
[ ! -d kolla-ansible ] && git clone https://github.com/openstack/kolla-ansible.git
|
||||
|
||||
#
|
||||
# For images version 3 and higher, placement api needs to be enabled, this
|
||||
# workaround can be removed after version 2.X.X images are retired.
|
||||
#
|
||||
rootdir=$(pwd)
|
||||
pushd kolla-ansible
|
||||
if [ "x$1" == "x3" ]; then
|
||||
git am $rootdir/tools/patches/0001-Revert-Fixes-problem-with-kolla-kubernetes-3.0.2-ima.patch
|
||||
fi
|
||||
popd
|
||||
|
||||
sudo ln -s `pwd`/kolla-ansible/etc/kolla /etc/kolla
|
||||
sudo ln -s `pwd`/kolla-ansible /usr/share/kolla
|
||||
sudo ln -s `pwd`/etc/kolla-kubernetes /etc/kolla-kubernetes
|
||||
|
|
Loading…
Reference in New Issue