@@ -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:

@@ -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

deleted file mode 100644

@@ -1,98 +0,0 @@

-import os

-

-DEBUG = True

-TEMPLATE_DEBUG = DEBUG

-PROD = False

-USE_SSL = False

-

-LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))

-

-# FIXME: We need to change this to mysql, instead of sqlite.

-DATABASES = {

-    'default': {

-        'ENGINE': 'django.db.backends.sqlite3',

-        'NAME': os.path.join(LOCAL_PATH, 'dashboard_openstack.sqlite3'),

-    },

-}

-

-CACHE_BACKEND = 'dummy://'

-

-# Add apps to dash installation.

-INSTALLED_APPS = (

-    'dashboard',

-    'django.contrib.contenttypes',

-    'django.contrib.sessions',

-    'django.contrib.messages',

-    'django.contrib.staticfiles',

-    'django_openstack',

-    'django_openstack.templatetags',

-    'mailer',

-)

-

-

-# Send email to the console by default

-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

-# Or send them to /dev/null

-#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'

-

-# django-mailer uses a different settings attribute

-MAILER_EMAIL_BACKEND = EMAIL_BACKEND

-

-# Configure these for your outgoing email host

-# EMAIL_HOST = 'smtp.my-company.com'

-# EMAIL_PORT = 25

-# EMAIL_HOST_USER = 'djangomail'

-# EMAIL_HOST_PASSWORD = 'top-secret!'

-

-# FIXME: This needs to be changed to allow for multi-node setup.

-OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0/"

-OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:35357/v2.0"

-OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"

-

-# NOTE(tres): Available services should come from the service

-#             catalog in Keystone.

-SWIFT_ENABLED = False

-

-# Configure quantum connection details for networking

-QUANTUM_ENABLED = False

-QUANTUM_URL = '127.0.0.1'

-QUANTUM_PORT = '9696'

-QUANTUM_TENANT = '1234'

-QUANTUM_CLIENT_VERSION='0.1'

-

-# No monitoring links currently

-EXTERNAL_MONITORING = []

-

-# Uncomment the following segment to silence most logging

-# django.db and boto DEBUG logging is extremely verbose.

-#LOGGING = {

-#        'version': 1,

-#        # set to True will disable all logging except that specified, unless

-#        # nothing is specified except that django.db.backends will still log,

-#        # even when set to True, so disable explicitly

-#        'disable_existing_loggers': False,

-#        'handlers': {

-#            'null': {

-#                'level': 'DEBUG',

-#                'class': 'django.utils.log.NullHandler',

-#                },

-#            'console': {

-#                'level': 'DEBUG',

-#                'class': 'logging.StreamHandler',

-#                },

-#            },

-#        'loggers': {

-#            # Comment or Uncomment these to turn on/off logging output

-#            'django.db.backends': {

-#                'handlers': ['null'],

-#                'propagate': False,

-#                },

-#            'django_openstack': {

-#                'handlers': ['null'],

-#                'propagate': False,

-#            },

-#        }

-#}

-

-# How much ram on each compute host?

-COMPUTE_HOST_RAM_GB = 16

new file mode 100644

@@ -0,0 +1,98 @@

+import os

+

+DEBUG = True

+TEMPLATE_DEBUG = DEBUG

+PROD = False

+USE_SSL = False

+

+LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))

+

+# FIXME: We need to change this to mysql, instead of sqlite.

+DATABASES = {

+    'default': {

+        'ENGINE': 'django.db.backends.sqlite3',

+        'NAME': os.path.join(LOCAL_PATH, 'dashboard_openstack.sqlite3'),

+    },

+}

+

+CACHE_BACKEND = 'dummy://'

+

+# Add apps to horizon installation.

+INSTALLED_APPS = (

+    'dashboard',

+    'django.contrib.contenttypes',

+    'django.contrib.sessions',

+    'django.contrib.messages',

+    'django.contrib.staticfiles',

+    'django_openstack',

+    'django_openstack.templatetags',

+    'mailer',

+)

+

+

+# Send email to the console by default

+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

+# Or send them to /dev/null

+#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'

+

+# django-mailer uses a different settings attribute

+MAILER_EMAIL_BACKEND = EMAIL_BACKEND

+

+# Configure these for your outgoing email host

+# EMAIL_HOST = 'smtp.my-company.com'

+# EMAIL_PORT = 25

+# EMAIL_HOST_USER = 'djangomail'

+# EMAIL_HOST_PASSWORD = 'top-secret!'

+

+# FIXME: This needs to be changed to allow for multi-node setup.

+OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0/"

+OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:35357/v2.0"

+OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"

+

+# NOTE(tres): Available services should come from the service

+#             catalog in Keystone.

+SWIFT_ENABLED = False

+

+# Configure quantum connection details for networking

+QUANTUM_ENABLED = False

+QUANTUM_URL = '127.0.0.1'

+QUANTUM_PORT = '9696'

+QUANTUM_TENANT = '1234'

+QUANTUM_CLIENT_VERSION='0.1'

+

+# No monitoring links currently

+EXTERNAL_MONITORING = []

+

+# Uncomment the following segment to silence most logging

+# django.db and boto DEBUG logging is extremely verbose.

+#LOGGING = {

+#        'version': 1,

+#        # set to True will disable all logging except that specified, unless

+#        # nothing is specified except that django.db.backends will still log,

+#        # even when set to True, so disable explicitly

+#        'disable_existing_loggers': False,

+#        'handlers': {

+#            'null': {

+#                'level': 'DEBUG',

+#                'class': 'django.utils.log.NullHandler',

+#                },

+#            'console': {

+#                'level': 'DEBUG',

+#                'class': 'logging.StreamHandler',

+#                },

+#            },

+#        'loggers': {

+#            # Comment or Uncomment these to turn on/off logging output

+#            'django.db.backends': {

+#                'handlers': ['null'],

+#                'propagate': False,

+#                },

+#            'django_openstack': {

+#                'handlers': ['null'],

+#                'propagate': False,

+#            },

+#        }

+#}

+

+# How much ram on each compute host?

+COMPUTE_HOST_RAM_GB = 16

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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!