Merge "add ubuntu noble (24.04) support"
diff --git a/openrc b/openrc
index b72bedb..e20a5a5 100644
--- a/openrc
+++ b/openrc
@@ -32,18 +32,11 @@
# Get some necessary configuration
source $RC_DIR/lib/tls
-# The OpenStack ecosystem has standardized the term **project** as the
-# entity that owns resources.
+# Minimal configuration
+export OS_AUTH_TYPE=password
export OS_PROJECT_NAME=${OS_PROJECT_NAME:-demo}
-
-# In addition to the owning entity (project), nova stores the entity performing
-# the action as the **user**.
export OS_USERNAME=${OS_USERNAME:-demo}
-
-# With Keystone you pass the keystone password instead of an api key.
export OS_PASSWORD=${ADMIN_PASSWORD:-secret}
-
-# Region
export OS_REGION_NAME=${REGION_NAME:-RegionOne}
# Set the host API endpoint. This will default to HOST_IP if SERVICE_IP_VERSION
@@ -65,9 +58,6 @@
# Identity API version
export OS_IDENTITY_API_VERSION=3
-# Ask keystoneauth1 to use keystone
-export OS_AUTH_TYPE=password
-
# Authenticating against an OpenStack cloud using Keystone returns a **Token**
# and **Service Catalog**. The catalog contains the endpoints for all services
# the user/project has access to - including nova, glance, keystone, swift, ...
diff --git a/stack.sh b/stack.sh
index 6ae324b..7754810 100755
--- a/stack.sh
+++ b/stack.sh
@@ -307,8 +307,8 @@
# rdo-release.el8.rpm points to latest RDO release, use that for master
sudo dnf -y install https://rdoproject.org/repos/rdo-release.el8.rpm
else
- # For stable branches use corresponding release rpm
- rdo_release=$(echo $TARGET_BRANCH | sed "s|stable/||g")
+ # For stable/unmaintained branches use corresponding release rpm
+ rdo_release=${TARGET_BRANCH#*/}
sudo dnf -y install https://rdoproject.org/repos/openstack-${rdo_release}/rdo-release-${rdo_release}.el8.rpm
fi
elif [[ $DISTRO == "rhel9" ]]; then
@@ -316,8 +316,8 @@
# rdo-release.el9.rpm points to latest RDO release, use that for master
sudo dnf -y install https://rdoproject.org/repos/rdo-release.el9.rpm
else
- # For stable branches use corresponding release rpm
- rdo_release=$(echo $TARGET_BRANCH | sed "s|stable/||g")
+ # For stable/unmaintained branches use corresponding release rpm
+ rdo_release=${TARGET_BRANCH#*/}
sudo dnf -y install https://rdoproject.org/repos/openstack-${rdo_release}/rdo-release-${rdo_release}.el9.rpm
fi
fi