x/devstack-plugin-tobiko
Code Issues Proposed changes

Always create keystone admin endpoint when tobiko is used

Browse Source 
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] b538b3267c

Change-Id: I62a25e3de2db8b0aab42eac34bc881822177db15
This commit is contained in:
Slawek Kaplonski 2023-03-16 11:12:32 +01:00 committed by Eduardo Olivares
parent 7b20683855
commit 310eddd59b
8 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -1,6 +1,11 @@
# Directory where this plugin.sh file is # Directory where this plugin.sh file is
TOBIKO_PLUGIN_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) 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 { function install_tobiko_deps {
install_python3 install_python3

2
playbooks/vagrant/designate/local.conf
View File

@ -1,7 +1,6 @@
[[local|localrc]] [[local|localrc]]
ADMIN_PASSWORD=secret ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD DATABASE_PASSWORD=$ADMIN_PASSWORD
KEYSTONE_ADMIN_ENDPOINT=True
RABBIT_PASSWORD=$ADMIN_PASSWORD RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD
@ -62,7 +61,6 @@ IP_VERSION=4
# ENABLE_CHASSIS_AS_GW=True # ENABLE_CHASSIS_AS_GW=True
ENABLE_TLS=False ENABLE_TLS=False
KEYSTONE_ADMIN_ENDPOINT=True
ML2_L3_PLUGIN=ovn-router,trunk ML2_L3_PLUGIN=ovn-router,trunk
OVN_BUILD_MODULES=False OVN_BUILD_MODULES=False
OVN_DBS_LOG_LEVEL=dbg OVN_DBS_LOG_LEVEL=dbg

1
playbooks/vagrant/octavia/local.conf
View File

@ -1,7 +1,6 @@
[[local|localrc]] [[local|localrc]]
ADMIN_PASSWORD=secret ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD DATABASE_PASSWORD=$ADMIN_PASSWORD
KEYSTONE_ADMIN_ENDPOINT=True
RABBIT_PASSWORD=$ADMIN_PASSWORD RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD
SERVICE_TOKEN=$ADMIN_PASSWORD SERVICE_TOKEN=$ADMIN_PASSWORD

2
playbooks/vagrant/ovn/local.conf
View File

@ -1,7 +1,6 @@
[[local|localrc]] [[local|localrc]]
ADMIN_PASSWORD=secret ADMIN_PASSWORD=secret
DATABASE_PASSWORD=${ADMIN_PASSWORD} DATABASE_PASSWORD=${ADMIN_PASSWORD}
KEYSTONE_ADMIN_ENDPOINT=True
RABBIT_PASSWORD=${ADMIN_PASSWORD} RABBIT_PASSWORD=${ADMIN_PASSWORD}
SERVICE_PASSWORD=${ADMIN_PASSWORD} SERVICE_PASSWORD=${ADMIN_PASSWORD}
@ -22,7 +21,6 @@ GLANCE_HOSTPORT=${SERVICE_HOST}:9292
# ENABLE_CHASSIS_AS_GW=True # ENABLE_CHASSIS_AS_GW=True
ENABLE_TLS=False ENABLE_TLS=False
KEYSTONE_ADMIN_ENDPOINT=True
ML2_L3_PLUGIN=ovn-router,trunk ML2_L3_PLUGIN=ovn-router,trunk
OVN_BUILD_MODULES=False OVN_BUILD_MODULES=False
OVN_DBS_LOG_LEVEL=dbg OVN_DBS_LOG_LEVEL=dbg

1
playbooks/vagrant/ovs-dvr/local.conf
View File

@ -1,7 +1,6 @@
[[local|localrc]] [[local|localrc]]
ADMIN_PASSWORD=secret ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD DATABASE_PASSWORD=$ADMIN_PASSWORD
KEYSTONE_ADMIN_ENDPOINT=True
RABBIT_PASSWORD=$ADMIN_PASSWORD RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD

1
playbooks/vagrant/ovs-octavia/local.conf
View File

@ -1,7 +1,6 @@
[[local|localrc]] [[local|localrc]]
ADMIN_PASSWORD=secret ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD DATABASE_PASSWORD=$ADMIN_PASSWORD
KEYSTONE_ADMIN_ENDPOINT=True
RABBIT_PASSWORD=$ADMIN_PASSWORD RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD
SERVICE_TOKEN=$ADMIN_PASSWORD SERVICE_TOKEN=$ADMIN_PASSWORD

1
playbooks/vagrant/ovs/local.conf
View File

@ -1,7 +1,6 @@
[[local|localrc]] [[local|localrc]]
ADMIN_PASSWORD=secret ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD DATABASE_PASSWORD=$ADMIN_PASSWORD
KEYSTONE_ADMIN_ENDPOINT=True
RABBIT_PASSWORD=$ADMIN_PASSWORD RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD

1
zuul.d/devstack-tobiko-minimal.yaml
View File

@ -37,7 +37,6 @@
configure_swap_size: 8192 configure_swap_size: 8192
devstack_localrc: devstack_localrc:
GLANCE_ENABLE_QUOTAS: false GLANCE_ENABLE_QUOTAS: false
KEYSTONE_ADMIN_ENDPOINT: true
LOG_COLOR: false LOG_COLOR: false
MULTI_HOST: 0 MULTI_HOST: 0
devstack_plugins: devstack_plugins: