Merge "Changes in horizon to match Juno"

openstack/training-guides

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2015年02月19日 20:25:26 +00:00

committed by Gerrit Code Review

parent 41323b97d3 048fd19cea

commit 59fbd04fb2

1 changed files with 11 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

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)

# 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."

sudo apt-get install -y apache2 memcached libapache2-mod-wsgi \

openstack-dashboard

sudo apt-get install -y openstack-dashboard apache2 libapache2-mod-wsgi \

memcached python-memcache

echo "Purging Ubuntu theme."

sudo dpkg --purge openstack-dashboard-ubuntu-theme

function check_dashboard_settings {

local memcached_conf=/etc/memcached.conf

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 "

local port=$(grep -Po -- '(?<=^-p )\d+' $memcached_conf)

@@ -41,13 +48,6 @@ function check_dashboard_settings {

echo -n "Time zone setting: "

grep TIME_ZONE $dashboard_conf