From ca85b7996a39e20833358eec638a2edb07789ffb Mon Sep 17 00:00:00 2001
From: Tres Henry <tres@treshenry.net>
Date: Fri, 28 Oct 2011 14:00:21 -0700
Subject: [PATCH] changing dash to horizon
---
README.md | 2 +-
files/000-default.template | 12 ++--
.../{dash_settings.py => horizon_settings.py} | 2 +-
stack.sh | 60 +++++++++----------
stackrc | 6 +-
tools/build_bm_multi.sh | 2 +-
tools/build_kvm.sh | 2 +-
tools/build_lxc.sh | 4 +-
tools/build_lxc_multi.sh | 2 +-
tools/build_nfs.sh | 2 +-
tools/build_ramdisk.sh | 2 +-
tools/xen/README.md | 6 +-
12 files changed, 51 insertions(+), 51 deletions(-)
rename files/{dash_settings.py => horizon_settings.py} (98%)
diff --git a/README.md b/README.md
index 82ef7fb07e..daf398b138 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Be sure to carefully read these scripts before you run them as they install soft
If working correctly, you should be able to access openstack endpoints, like:
-* Dashboard: http://myhost/
+* Horizon: http://myhost/
* Keystone: http://myhost:5000/v2.0/
# To start a dev cloud in an lxc container:
diff --git a/files/000-default.template b/files/000-default.template
index 4e4b5c4f8b..fa8a86a361 100644
--- a/files/000-default.template
+++ b/files/000-default.template
@@ -1,19 +1,19 @@
<VirtualHost *:80>
- WSGIScriptAlias / %DASH_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi
- WSGIDaemonProcess dashboard user=%USER% group=%USER% processes=3 threads=10
+ WSGIScriptAlias / %HORIZON_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi
+ WSGIDaemonProcess horizon user=%USER% group=%USER% processes=3 threads=10
SetEnv APACHE_RUN_USER %USER%
SetEnv APACHE_RUN_GROUP %USER%
- WSGIProcessGroup dashboard
+ WSGIProcessGroup horizon
- DocumentRoot %DASH_DIR%/.blackhole/
- Alias /media %DASH_DIR%/openstack-dashboard/media
+ DocumentRoot %HORIZON_DIR%/.blackhole/
+ Alias /media %HORIZON_DIR%/openstack-dashboard/media
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
- <Directory %DASH_DIR%/>
+ <Directory %HORIZON_DIR%/>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Order allow,deny
diff --git a/files/dash_settings.py b/files/horizon_settings.py
similarity index 98%
rename from files/dash_settings.py
rename to files/horizon_settings.py
index 74d0350deb..3a17db2c5c 100644
--- a/files/dash_settings.py
+++ b/files/horizon_settings.py
@@ -17,7 +17,7 @@ DATABASES = {
CACHE_BACKEND = 'dummy://'
-# Add apps to dash installation.
+# Add apps to horizon installation.
INSTALLED_APPS = (
'dashboard',
'django.contrib.contenttypes',
diff --git a/stack.sh b/stack.sh
index 4023058ae3..b91622364e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -2,7 +2,7 @@
# **stack.sh** is an opinionated openstack developer installation.
-# This script installs and configures *nova*, *glance*, *dashboard* and *keystone*
+# This script installs and configures *nova*, *glance*, *horizon* and *keystone*
# This script allows you to specify configuration options of what git
# repositories to use, enabled services, network configuration and various
@@ -90,7 +90,7 @@ function apt_get() {
}
-# OpenStack is designed to be run as a regular user (Dashboard will fail to run
+# OpenStack is designed to be run as a regular user (Horizon will fail to run
# as root, since apache refused to startup serve content from root user). If
# stack.sh is run as root, it automatically creates a stack user with
# sudo privileges and runs as that user.
@@ -129,7 +129,7 @@ if [[ $EUID -eq 0 ]]; then
fi
exit 1
else
- # Our user needs passwordless priviledges for certain commands which nova
+ # Our user needs passwordless priviledges for certain commands which nova
# uses internally.
# Natty uec images sudoers does not have a '#includedir'. add one.
sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||
@@ -144,7 +144,7 @@ fi
# Set the destination directories for openstack projects
NOVA_DIR=$DEST/nova
-DASH_DIR=$DEST/dash
+HORIZON_DIR=$DEST/horizon
GLANCE_DIR=$DEST/glance
KEYSTONE_DIR=$DEST/keystone
NOVACLIENT_DIR=$DEST/python-novaclient
@@ -152,7 +152,7 @@ OPENSTACKX_DIR=$DEST/openstackx
NOVNC_DIR=$DEST/noVNC
# Specify which services to launch. These generally correspond to screen tabs
-ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit}
+ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,horizon,mysql,rabbit}
# Nova hypervisor configuration. We default to libvirt whth **kvm** but will
# drop back to **qemu** if we are unable to load the kvm module. Stack.sh can
@@ -248,7 +248,7 @@ FLAT_INTERFACE=${FLAT_INTERFACE:-eth0}
# MySQL & RabbitMQ
# ----------------
-# We configure Nova, Dashboard, Glance and Keystone to use MySQL as their
+# We configure Nova, Horizon, Glance and Keystone to use MySQL as their
# database server. While they share a single server, each has their own
# database and tables.
@@ -277,8 +277,8 @@ GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$HOST_IP:9292}
# Service Token - Openstack components need to have an admin token
# to validate user tokens.
read_password SERVICE_TOKEN "ENTER A SERVICE_TOKEN TO USE FOR THE SERVICE ADMIN TOKEN."
-# Dash currently truncates usernames and passwords at 20 characters
-read_password ADMIN_PASSWORD "ENTER A PASSWORD TO USE FOR DASH AND KEYSTONE (20 CHARS OR LESS)."
+# Horizon currently truncates usernames and passwords at 20 characters
+read_password ADMIN_PASSWORD "ENTER A PASSWORD TO USE FOR HORIZON AND KEYSTONE (20 CHARS OR LESS)."
LOGFILE=${LOGFILE:-"$PWD/stack.sh.$$.log"}
(
@@ -356,8 +356,8 @@ git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
# a websockets/html5 or flash powered VNC console for vm instances
git_clone $NOVNC_REPO $NOVNC_DIR $NOVNC_BRANCH
# django powered web control panel for openstack
-git_clone $DASH_REPO $DASH_DIR $DASH_BRANCH $DASH_TAG
-# python client library to nova that dashboard (and others) use
+git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
+# python client library to nova that horizon (and others) use
git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH
# openstackx is a collection of extensions to openstack.compute & nova
# that is *deprecated*. The code is being moved into python-novaclient & nova.
@@ -374,8 +374,8 @@ cd $GLANCE_DIR; sudo python setup.py develop
cd $NOVACLIENT_DIR; sudo python setup.py develop
cd $NOVA_DIR; sudo python setup.py develop
cd $OPENSTACKX_DIR; sudo python setup.py develop
-cd $DASH_DIR/django-openstack; sudo python setup.py develop
-cd $DASH_DIR/openstack-dashboard; sudo python setup.py develop
+cd $HORIZON_DIR/django-openstack; sudo python setup.py develop
+cd $HORIZON_DIR/openstack-dashboard; sudo python setup.py develop
# Add a useful screenrc. This isn't required to run openstack but is we do
# it since we are going to run the services in screen for simple
@@ -432,36 +432,36 @@ EOF
fi
-# Dashboard
+# Horizon
# ---------
-# Setup the django dashboard application to serve via apache/wsgi
+# Setup the django horizon application to serve via apache/wsgi
-if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then
+if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
- # Dash currently imports quantum even if you aren't using it. Instead
+ # Horizon currently imports quantum even if you aren't using it. Instead
# of installing quantum we can create a simple module that will pass the
# initial imports
- mkdir -p $DASH_DIR/openstack-dashboard/quantum || true
- touch $DASH_DIR/openstack-dashboard/quantum/__init__.py
- touch $DASH_DIR/openstack-dashboard/quantum/client.py
+ mkdir -p $HORIZON_DIR/openstack-dashboard/quantum || true
+ touch $HORIZON_DIR/openstack-dashboard/quantum/__init__.py
+ touch $HORIZON_DIR/openstack-dashboard/quantum/client.py
- # ``local_settings.py`` is used to override dashboard default settings.
- cp $FILES/dash_settings.py $DASH_DIR/openstack-dashboard/local/local_settings.py
+ # ``local_settings.py`` is used to override horizon default settings.
+ cp $FILES/horizon_settings.py $HORIZON_DIR/openstack-dashboard/local/local_settings.py
- # Initialize the dashboard database (it stores sessions and notices shown to
+ # Initialize the horizon database (it stores sessions and notices shown to
# users). The user system is external (keystone).
- cd $DASH_DIR/openstack-dashboard
+ cd $HORIZON_DIR/openstack-dashboard
dashboard/manage.py syncdb
# create an empty directory that apache uses as docroot
- sudo mkdir -p $DASH_DIR/.blackhole
+ sudo mkdir -p $HORIZON_DIR/.blackhole
- ## Configure apache's 000-default to run dashboard
+ ## Configure apache's 000-default to run horizon
sudo cp $FILES/000-default.template /etc/apache2/sites-enabled/000-default
sudo sed -e "s,%USER%,$USER,g" -i /etc/apache2/sites-enabled/000-default
- sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default
+ sudo sed -e "s,%HORIZON_DIR%,$HORIZON_DIR,g" -i /etc/apache2/sites-enabled/000-default
sudo service apache2 restart
fi
@@ -769,7 +769,7 @@ screen_it n-vol "cd $NOVA_DIR && $NOVA_DIR/bin/nova-volume"
screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"
screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"
screen_it n-vnc "cd $NOVNC_DIR && ./utils/nova-wsproxy.py 6080 --web . --flagfile=../nova/bin/nova.conf"
-screen_it dash "cd $DASH_DIR && sudo tail -f /var/log/apache2/error.log"
+screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/apache2/error.log"
# Install Images
# ==============
@@ -838,10 +838,10 @@ for ret in "${PIPESTATUS[@]}"; do [ $ret -eq 0 ] || exit $ret; done
# Using the cloud
# ===============
-# If you installed the dashboard on this server, then you should be able
+# If you installed the horizon on this server, then you should be able
# to access the site using your browser.
-if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then
- echo "dashboard is now available at http://$HOST_IP/"
+if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
+ echo "horizon is now available at http://$HOST_IP/"
fi
# If keystone is present, you can point nova cli to this server
diff --git a/stackrc b/stackrc
index 9ba1043583..9b110a37de 100644
--- a/stackrc
+++ b/stackrc
@@ -15,10 +15,10 @@ NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git
NOVNC_BRANCH=diablo
# django powered web control panel for openstack
-DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git
-DASH_BRANCH=diablo
+HORIZON_REPO=https://github.com/openstack/horizon.git
+HORIZON_BRANCH=stable/diablo
-# python client library to nova that dashboard (and others) use
+# python client library to nova that horizon (and others) use
NOVACLIENT_REPO=https://github.com/rackspace/python-novaclient.git
NOVACLIENT_BRANCH=master
diff --git a/tools/build_bm_multi.sh b/tools/build_bm_multi.sh
index 44c0705884..133d5372cf 100755
--- a/tools/build_bm_multi.sh
+++ b/tools/build_bm_multi.sh
@@ -13,7 +13,7 @@ function run_bm {
# Launch the head node - headnode uses a non-ip domain name,
# because rabbit won't launch with an ip addr hostname :(
-run_bm STACKMASTER $HEAD_HOST "ENABLED_SERVICES=g-api,g-reg,key,n-api,n-sch,n-vnc,dash,mysql,rabbit"
+run_bm STACKMASTER $HEAD_HOST "ENABLED_SERVICES=g-api,g-reg,key,n-api,n-sch,n-vnc,horizon,mysql,rabbit"
# Wait till the head node is up
if [ ! "$TERMINATE" = "1" ]; then
diff --git a/tools/build_kvm.sh b/tools/build_kvm.sh
index e6cb3e38fb..1b33926044 100755
--- a/tools/build_kvm.sh
+++ b/tools/build_kvm.sh
@@ -146,7 +146,7 @@ git_clone $NOVA_REPO $COPY_DIR/$DEST/nova $NOVA_BRANCH
git_clone $GLANCE_REPO $COPY_DIR/$DEST/glance $GLANCE_BRANCH
git_clone $KEYSTONE_REPO $COPY_DIR/$DESTkeystone $KEYSTONE_BRANCH
git_clone $NOVNC_REPO $COPY_DIR/$DEST/noVNC $NOVNC_BRANCH
-git_clone $DASH_REPO $COPY_DIR/$DEST/dash $DASH_BRANCH $DASH_TAG
+git_clone $HORIZON_REPO $COPY_DIR/$DEST/horizon $HORIZON_BRANCH $HORIZON_TAG
git_clone $NOVACLIENT_REPO $COPY_DIR/$DEST/python-novaclient $NOVACLIENT_BRANCH
git_clone $OPENSTACKX_REPO $COPY_DIR/$DEST/openstackx $OPENSTACKX_BRANCH
git_clone $KEYSTONE_REPO $COPY_DIR/$DEST/keystone $KEYSTONE_BRANCH
diff --git a/tools/build_lxc.sh b/tools/build_lxc.sh
index 786d8398c6..a2c5a22e12 100755
--- a/tools/build_lxc.sh
+++ b/tools/build_lxc.sh
@@ -39,7 +39,7 @@ WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1}
# Param string to pass to stack.sh. Like "EC2_DMZ_HOST=192.168.1.1 MYSQL_USER=nova"
# By default, n-vol is disabled for lxc, as iscsitarget doesn't work properly in lxc
-STACKSH_PARAMS=${STACKSH_PARAMS:-"ENABLED_SERVICES=g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit"}
+STACKSH_PARAMS=${STACKSH_PARAMS:-"ENABLED_SERVICES=g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,horizon,mysql,rabbit"}
# Option to use the version of devstack on which we are currently working
USE_CURRENT_DEVSTACK=${USE_CURRENT_DEVSTACK:-1}
@@ -140,7 +140,7 @@ git_clone $NOVA_REPO $CACHEDIR/$DEST/nova $NOVA_BRANCH
git_clone $GLANCE_REPO $CACHEDIR/$DEST/glance $GLANCE_BRANCH
git_clone $KEYSTONE_REPO $CACHEDIR/$DESTkeystone $KEYSTONE_BRANCH
git_clone $NOVNC_REPO $CACHEDIR/$DEST/noVNC $NOVNC_BRANCH
-git_clone $DASH_REPO $CACHEDIR/$DEST/dash $DASH_BRANCH $DASH_TAG
+git_clone $HORIZON_REPO $CACHEDIR/$DEST/horizon $HORIZON_BRANCH $HORIZON_TAG
git_clone $NOVACLIENT_REPO $CACHEDIR/$DEST/python-novaclient $NOVACLIENT_BRANCH
git_clone $OPENSTACKX_REPO $CACHEDIR/$DEST/openstackx $OPENSTACKX_BRANCH
git_clone $KEYSTONE_REPO $CACHEDIR/$DEST/keystone $KEYSTONE_BRANCH
diff --git a/tools/build_lxc_multi.sh b/tools/build_lxc_multi.sh
index 5418ac926c..9c12958024 100755
--- a/tools/build_lxc_multi.sh
+++ b/tools/build_lxc_multi.sh
@@ -23,7 +23,7 @@ function run_lxc {
# Launch the head node - headnode uses a non-ip domain name,
# because rabbit won't launch with an ip addr hostname :(
-run_lxc STACKMASTER $HEAD_HOST "ENABLED_SERVICES=g-api,g-reg,key,n-api,n-sch,n-vnc,dash,mysql,rabbit"
+run_lxc STACKMASTER $HEAD_HOST "ENABLED_SERVICES=g-api,g-reg,key,n-api,n-sch,n-vnc,horizon,mysql,rabbit"
# Wait till the head node is up
if [ ! "$TERMINATE" = "1" ]; then
diff --git a/tools/build_nfs.sh b/tools/build_nfs.sh
index 36126fa83d..5c591e44e0 100755
--- a/tools/build_nfs.sh
+++ b/tools/build_nfs.sh
@@ -90,7 +90,7 @@ git_clone $NOVA_REPO $DEST/nova $NOVA_BRANCH
git_clone $GLANCE_REPO $DEST/glance $GLANCE_BRANCH
git_clone $KEYSTONE_REPO $DEST/keystone $KEYSTONE_BRANCH
git_clone $NOVNC_REPO $DEST/novnc $NOVNC_BRANCH
-git_clone $DASH_REPO $DEST/dash $DASH_BRANCH $DASH_TAG
+git_clone $HORIZON_REPO $DEST/horizon $HORIZON_BRANCH $HORIZON_TAG
git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH
git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH
diff --git a/tools/build_ramdisk.sh b/tools/build_ramdisk.sh
index d169b9f7f1..43f8999cfc 100755
--- a/tools/build_ramdisk.sh
+++ b/tools/build_ramdisk.sh
@@ -138,7 +138,7 @@ git_clone $NOVA_REPO $DEST/nova $NOVA_BRANCH
git_clone $GLANCE_REPO $DEST/glance $GLANCE_BRANCH
git_clone $KEYSTONE_REPO $DEST/keystone $KEYSTONE_BRANCH
git_clone $NOVNC_REPO $DEST/novnc $NOVNC_BRANCH
-git_clone $DASH_REPO $DEST/dash $DASH_BRANCH
+git_clone $HORIZON_REPO $DEST/horizon $HORIZON_BRANCH
git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH
git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH
diff --git a/tools/xen/README.md b/tools/xen/README.md
index 3a4bedd845..d918c162a6 100644
--- a/tools/xen/README.md
+++ b/tools/xen/README.md
@@ -25,13 +25,13 @@ need to run devstack (like git). Do this to install required software:
wget --no-check-certificate https://github.com/cloudbuilders/devstack/raw/xen/tools/xen/prepare_dom0.sh
chmod 755 prepare_dom0.sh
- ./prepare_dom0.sh
+ ./prepare_dom0.sh
This script will also clone devstack in /root/devstack
Step 3: Configure your localrc
-----------------------------
-Devstack uses a localrc for user-specific configuration. Note that
+Devstack uses a localrc for user-specific configuration. Note that
the XENAPI_PASSWORD must be your dom0 root password.
Of course, use real passwords if this machine is exposed.
@@ -59,6 +59,6 @@ But in a nutshell, it performs the following:
Step 5: Do cloudy stuff!
--------------------------
-* Play with dashboard
+* Play with horizon
* Play with the CLI
* Log bugs to devstack and core projects, and submit fixes!