openstack/training-guides
Code Issues Proposed changes

Changes in horizon to match Juno

Browse Source 
Reorder and add python-memcache.

Change-Id: Iee764a4308f445c92cc142d00b995405d84d3bd8
This commit is contained in:
Roger Luethi
2014-12-29 16:18:28 +01:00
parent c0a6c50ecf
commit 048fd19cea
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
labs/scripts/ubuntu/setup_horizon.sh
View File

@@ -9,20 +9,27 @@ indicate_current_auto
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Set up OpenStack Dashboard (horizon) # Set up OpenStack Dashboard (horizon)
# http://docs.openstack.org/icehouse/install-guide/install/apt/content/install_dashboard.html # http://docs.openstack.org/juno/install-guide/install/apt/content/install_dashboard.html
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
echo "Installing horizon." echo "Installing horizon."
sudo apt-get install -y apache2 memcached libapache2-mod-wsgi \ sudo apt-get install -y openstack-dashboard apache2 libapache2-mod-wsgi \
openstack-dashboard memcached python-memcache
echo "Purging Ubuntu theme." echo "Purging Ubuntu theme."
sudo dpkg --purge openstack-dashboard-ubuntu-theme sudo dpkg --purge openstack-dashboard-ubuntu-theme
function check_dashboard_settings { function check_dashboard_settings {
local memcached_conf=/etc/memcached.conf
local dashboard_conf=/etc/openstack-dashboard/local_settings.py local dashboard_conf=/etc/openstack-dashboard/local_settings.py
local auth_host=controller-mgmt
echo "Setting OPENSTACK_HOST = \"$auth_host\"."
sudo sed -i "s#^\(OPENSTACK_HOST =\).*#\1 \"$auth_host\";#" $dashboard_conf
echo -n "Allowed hosts: "
grep "^ALLOWED_HOSTS" $dashboard_conf
local memcached_conf=/etc/memcached.conf
# Port is a number on line starting with "-p " # Port is a number on line starting with "-p "
local port=$(grep -Po -- '(?<=^-p )\d+' $memcached_conf) local port=$(grep -Po -- '(?<=^-p )\d+' $memcached_conf)
@@ -41,13 +48,6 @@ function check_dashboard_settings {
echo -n "Time zone setting: " echo -n "Time zone setting: "
grep TIME_ZONE $dashboard_conf grep TIME_ZONE $dashboard_conf
echo -n "Allowed hosts: "
grep "^ALLOWED_HOSTS" $dashboard_conf
local auth_host=controller-mgmt
echo "Setting OPENSTACK_HOST = \"$auth_host\"."
sudo sed -i "s#^\(OPENSTACK_HOST =\).*#\1 \"$auth_host\";#" $dashboard_conf
} }
echo "Checking dashboard configuration." echo "Checking dashboard configuration."