With the move to flask, Keystone does not utilize paste-ini. This
patchset removes the paste-ini support from devstack for Keystone.
Change-Id: I8dd629937c9178660992fd648175dbef80ffa3c2
| ... | ... |
@@ -49,7 +49,6 @@ fi |
| 49 | 49 |
|
| 50 | 50 |
KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone}
|
| 51 | 51 |
KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf |
| 52 |
-KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini}
|
|
| 53 | 52 |
KEYSTONE_PUBLIC_UWSGI_CONF=$KEYSTONE_CONF_DIR/keystone-uwsgi-public.ini |
| 54 | 53 |
KEYSTONE_ADMIN_UWSGI_CONF=$KEYSTONE_CONF_DIR/keystone-uwsgi-admin.ini |
| 55 | 54 |
KEYSTONE_PUBLIC_UWSGI=$KEYSTONE_BIN_DIR/keystone-wsgi-public |
| ... | ... |
@@ -203,23 +202,7 @@ function configure_keystone {
|
| 203 | 203 |
|
| 204 | 204 |
if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then |
| 205 | 205 |
install -m 600 /dev/null $KEYSTONE_CONF |
| 206 |
- if [[ -f "$KEYSTONE_DIR/etc/keystone-paste.ini" ]]; then |
|
| 207 |
- cp -p "$KEYSTONE_DIR/etc/keystone-paste.ini" "$KEYSTONE_PASTE_INI" |
|
| 208 |
- fi |
|
| 209 | 206 |
fi |
| 210 |
- if [[ -f "$KEYSTONE_PASTE_INI" ]]; then |
|
| 211 |
- iniset "$KEYSTONE_CONF" paste_deploy config_file "$KEYSTONE_PASTE_INI" |
|
| 212 |
- else |
|
| 213 |
- # compatibility with mixed cfg and paste.deploy configuration |
|
| 214 |
- KEYSTONE_PASTE_INI="$KEYSTONE_CONF" |
|
| 215 |
- fi |
|
| 216 |
- |
|
| 217 |
- if [ "$ENABLE_IDENTITY_V2" == "False" ]; then |
|
| 218 |
- # Only Identity v3 API should be available; then disable v2 pipelines |
|
| 219 |
- inidelete $KEYSTONE_PASTE_INI composite:main \\/v2.0 |
|
| 220 |
- inidelete $KEYSTONE_PASTE_INI composite:admin \\/v2.0 |
|
| 221 |
- fi |
|
| 222 |
- |
|
| 223 | 207 |
# Populate ``keystone.conf`` |
| 224 | 208 |
if is_service_enabled ldap; then |
| 225 | 209 |
iniset $KEYSTONE_CONF identity domain_config_dir "$KEYSTONE_CONF_DIR/domains" |