Skip to content

Commit 9931327

Browse files
committed
Drop workaround for old gophercloud
The capability to detect available API versions was added to gophercloud 8+ years ago[1] and has been available since v0.1.0. [1] gophercloud/gophercloud#508 Change-Id: Ie5ea248a04b15215545723303ab225aa1257de66 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
1 parent a2c9db1 commit 9931327

2 files changed

Lines changed: 0 additions & 41 deletions

File tree

devstack/lib/magnum

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
# - magnum_configure_flavor
2020
# - start_magnum
2121
# - configure_iptables_magnum
22-
# - configure_apache_magnum
2322
# - stop_magnum
2423
# - cleanup_magnum
2524

@@ -376,45 +375,6 @@ function configure_iptables_magnum {
376375
fi
377376
}
378377

379-
function configure_apache_magnum {
380-
# Set redirection for kubernetes openstack cloud provider
381-
# FIXME: When [1] is in kubernetes, we won't need the redirection anymore.
382-
# [1] https://github.com/gophercloud/gophercloud/pull/423
383-
HTACCESS_PATH=/var/www/html
384-
if is_ubuntu; then
385-
OVERRIDE_CONF_FILE=/etc/apache2/apache2.conf
386-
elif is_fedora; then
387-
OVERRIDE_CONF_FILE=/etc/httpd/conf/httpd.conf
388-
fi
389-
# If horizon is enabled then we need
390-
if is_service_enabled horizon; then
391-
HTACCESS_PATH=$DEST/horizon/.blackhole
392-
sudo tee -a $APACHE_CONF_DIR/horizon.conf <<EOF
393-
<Directory $HTACCESS_PATH>
394-
Options Indexes FollowSymLinks
395-
AllowOverride all
396-
Require all granted
397-
</Directory>
398-
EOF
399-
else
400-
sudo tee -a $OVERRIDE_CONF_FILE <<EOF
401-
<Directory $HTACCESS_PATH>
402-
Options Indexes FollowSymLinks
403-
AllowOverride all
404-
Require all granted
405-
</Directory>
406-
EOF
407-
fi
408-
409-
sudo mkdir -p $HTACCESS_PATH
410-
sudo tee $HTACCESS_PATH/.htaccess <<EOF
411-
RewriteEngine on
412-
RewriteRule ^v2\.0(.*) /identity/v2.0\$1
413-
RewriteRule ^v3(.*) /identity/v3\$1
414-
EOF
415-
enable_apache_mod rewrite
416-
}
417-
418378
# start_magnum() - Start running processes, including screen
419379
function start_magnum {
420380

devstack/plugin.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ if is_service_enabled magnum-api magnum-cond; then
4646
start_magnum
4747

4848
configure_iptables_magnum
49-
configure_apache_magnum
5049
fi
5150

5251
if [[ "$1" == "unstack" ]]; then

0 commit comments

Comments
 (0)