Merge "Make the Horizon dashboard work properly"

compose/horizon.yml

@@ -0,0 +1,7 @@
+horizon:
+  image: kollaglue/centos-rdo-horizon
+  name: horizon
+  net: "host"
+  restart: always
+  env_file:
+   - openstack.env

docker/horizon/Dockerfile

@@ -1,8 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-RUN yum -y install \
-    openstack-dashboard && yum clean all
+RUN yum -y install openstack-dashboard \
+        httpd httpd-mod-wsgi && yum clean all
 
 EXPOSE 80
 

docker/horizon/start.sh

@@ -8,14 +8,16 @@ set -e
 check_for_keystone
 check_for_glance
 check_for_nova
-check_for_neutron
+
+export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
+export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
 
 cfg=/etc/openstack-dashboard/local_settings
 
-sed -ri 's/#ALLOWED_HOSTS = \['\''horizon.example.com'\'', '\''localhost'\''\]/ALLOWED_HOSTS = \['\''*'\'', \]/' /etc/openstack-dashboard/local_settings
+sed -ri 's/ALLOWED_HOSTS = \['\''horizon.example.com'\'', '\''localhost'\''\]/ALLOWED_HOSTS = \['\''*'\'', \]/' /etc/openstack-dashboard/local_settings
 
 sed -ri 's/OPENSTACK_KEYSTONE_URL = \"http:\/\/%s:5000\/v2.0\" % OPENSTACK_HOST/OPENSTACK_KEYSTONE_URL = \"http:\/\/'"$KEYSTONE_PUBLIC_SERVICE_HOST"':5000\/v2.0\"/' /etc/openstack-dashboard/local_settings
 
 sed -ri 's/OPENSTACK_HOST = \"127.0.0.1\"/OPENSTACK_HOST = \"'"$KEYSTONE_PUBLIC_SERVICE_HOST"'\" /' /etc/openstack-dashboard/local_settings
 
-/bin/keystone role-create --name ${HORIZON_KEYSTONE_USER}
+/usr/sbin/httpd -DFOREGROUND

tools/start

@@ -49,6 +49,9 @@ docker-compose -f ./compose/nova-compute-network.yml up -d
 echo Starting heat.
 docker-compose -f ./compose/heat-api-engine.yml up -d
 
+echo Starting Horizon.
+docker-compose -f ./compose/horizon.yml up -d
+
 IMAGE_URL=http://download.cirros-cloud.net/0.3.3/
 IMAGE=cirros-0.3.3-x86_64-disk.img
 if ! [ -f "$IMAGE" ]; then