From 310eddd59b171f62ec64eef0535150d6b42fd100 Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Thu, 16 Mar 2023 11:12:32 +0100
Subject: [PATCH] Always create keystone admin endpoint when tobiko is used

Tobiko requires keystone admin endpoint to be created. It was disabled
to be created by default in Devstack by [1].
This patch forces this option to be enabled when tobiko is going to be
installed by devstack.

[1] https://github.com/openstack/devstack/commit/b538b3267cec11f0b345ce101607bbd36ada8f32

Change-Id: I62a25e3de2db8b0aab42eac34bc881822177db15
---
 devstack/plugin.sh                       | 5 +++++
 playbooks/vagrant/designate/local.conf   | 2 --
 playbooks/vagrant/octavia/local.conf     | 1 -
 playbooks/vagrant/ovn/local.conf         | 2 --
 playbooks/vagrant/ovs-dvr/local.conf     | 1 -
 playbooks/vagrant/ovs-octavia/local.conf | 1 -
 playbooks/vagrant/ovs/local.conf         | 1 -
 zuul.d/devstack-tobiko-minimal.yaml      | 1 -
 8 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 0b73b2f..e56b87e 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -1,6 +1,11 @@
 # Directory where this plugin.sh file is
 TOBIKO_PLUGIN_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
+# NOTE(slaweq): Tobiko requires admin endpoint for keystone to be enabled,
+# creation of such endpoint was disabled by default with:
+# https://github.com/openstack/devstack/commit/b538b3267cec11f0b345ce101607bbd36ada8f32
+# so let's enable it always when Tobiko is installed
+KEYSTONE_ADMIN_ENDPOINT=True
 
 function install_tobiko_deps {
     install_python3
diff --git a/playbooks/vagrant/designate/local.conf b/playbooks/vagrant/designate/local.conf
index e32ee50..2d4dcb5 100644
--- a/playbooks/vagrant/designate/local.conf
+++ b/playbooks/vagrant/designate/local.conf
@@ -1,7 +1,6 @@
 [[local|localrc]]
 ADMIN_PASSWORD=secret
 DATABASE_PASSWORD=$ADMIN_PASSWORD
-KEYSTONE_ADMIN_ENDPOINT=True
 RABBIT_PASSWORD=$ADMIN_PASSWORD
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 
@@ -62,7 +61,6 @@ IP_VERSION=4
 
 # ENABLE_CHASSIS_AS_GW=True
 ENABLE_TLS=False
-KEYSTONE_ADMIN_ENDPOINT=True
 ML2_L3_PLUGIN=ovn-router,trunk
 OVN_BUILD_MODULES=False
 OVN_DBS_LOG_LEVEL=dbg
diff --git a/playbooks/vagrant/octavia/local.conf b/playbooks/vagrant/octavia/local.conf
index f11af36..5e87b8a 100644
--- a/playbooks/vagrant/octavia/local.conf
+++ b/playbooks/vagrant/octavia/local.conf
@@ -1,7 +1,6 @@
 [[local|localrc]]
 ADMIN_PASSWORD=secret
 DATABASE_PASSWORD=$ADMIN_PASSWORD
-KEYSTONE_ADMIN_ENDPOINT=True
 RABBIT_PASSWORD=$ADMIN_PASSWORD
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 SERVICE_TOKEN=$ADMIN_PASSWORD
diff --git a/playbooks/vagrant/ovn/local.conf b/playbooks/vagrant/ovn/local.conf
index 758d9fe..d0f6076 100644
--- a/playbooks/vagrant/ovn/local.conf
+++ b/playbooks/vagrant/ovn/local.conf
@@ -1,7 +1,6 @@
 [[local|localrc]]
 ADMIN_PASSWORD=secret
 DATABASE_PASSWORD=${ADMIN_PASSWORD}
-KEYSTONE_ADMIN_ENDPOINT=True
 RABBIT_PASSWORD=${ADMIN_PASSWORD}
 SERVICE_PASSWORD=${ADMIN_PASSWORD}
 
@@ -22,7 +21,6 @@ GLANCE_HOSTPORT=${SERVICE_HOST}:9292
 
 # ENABLE_CHASSIS_AS_GW=True
 ENABLE_TLS=False
-KEYSTONE_ADMIN_ENDPOINT=True
 ML2_L3_PLUGIN=ovn-router,trunk
 OVN_BUILD_MODULES=False
 OVN_DBS_LOG_LEVEL=dbg
diff --git a/playbooks/vagrant/ovs-dvr/local.conf b/playbooks/vagrant/ovs-dvr/local.conf
index a69d945..97515e3 100644
--- a/playbooks/vagrant/ovs-dvr/local.conf
+++ b/playbooks/vagrant/ovs-dvr/local.conf
@@ -1,7 +1,6 @@
 [[local|localrc]]
 ADMIN_PASSWORD=secret
 DATABASE_PASSWORD=$ADMIN_PASSWORD
-KEYSTONE_ADMIN_ENDPOINT=True
 RABBIT_PASSWORD=$ADMIN_PASSWORD
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 
diff --git a/playbooks/vagrant/ovs-octavia/local.conf b/playbooks/vagrant/ovs-octavia/local.conf
index ef9f760..c3aa2fc 100644
--- a/playbooks/vagrant/ovs-octavia/local.conf
+++ b/playbooks/vagrant/ovs-octavia/local.conf
@@ -1,7 +1,6 @@
 [[local|localrc]]
 ADMIN_PASSWORD=secret
 DATABASE_PASSWORD=$ADMIN_PASSWORD
-KEYSTONE_ADMIN_ENDPOINT=True
 RABBIT_PASSWORD=$ADMIN_PASSWORD
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 SERVICE_TOKEN=$ADMIN_PASSWORD
diff --git a/playbooks/vagrant/ovs/local.conf b/playbooks/vagrant/ovs/local.conf
index 6a075ba..9395aa0 100644
--- a/playbooks/vagrant/ovs/local.conf
+++ b/playbooks/vagrant/ovs/local.conf
@@ -1,7 +1,6 @@
 [[local|localrc]]
 ADMIN_PASSWORD=secret
 DATABASE_PASSWORD=$ADMIN_PASSWORD
-KEYSTONE_ADMIN_ENDPOINT=True
 RABBIT_PASSWORD=$ADMIN_PASSWORD
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 
diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml
index ef29f8a..e835200 100644
--- a/zuul.d/devstack-tobiko-minimal.yaml
+++ b/zuul.d/devstack-tobiko-minimal.yaml
@@ -37,7 +37,6 @@
       configure_swap_size: 8192
       devstack_localrc:
         GLANCE_ENABLE_QUOTAS: false
-        KEYSTONE_ADMIN_ENDPOINT: true
         LOG_COLOR: false
         MULTI_HOST: 0
       devstack_plugins: