diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-21 03:15:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-21 03:15:58 +0000 |
| commit | 68978c2338efc08f9cfa2ec9f272fd15faa885e0 (patch) | |
| tree | 6f4db48e0f0eec646bb6ac5fbd8af8782078c586 /docker | |
| parent | a99a861bc01dba543150a458d90f52b29e38bebc (diff) | |
| parent | 71576f4e420b9147917469f1ff26018435da80ac (diff) | |
| download | kolla-68978c2338efc08f9cfa2ec9f272fd15faa885e0.tar.gz kolla-68978c2338efc08f9cfa2ec9f272fd15faa885e0.zip | |
Merge "Make the Horizon dashboard work properly"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile | 4 | ||||
| -rwxr-xr-x | docker/horizon/start.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/docker/horizon/Dockerfile b/docker/horizon/Dockerfile index d05d07f2a..eafff2faa 100644 --- a/docker/horizon/Dockerfile +++ b/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 diff --git a/docker/horizon/start.sh b/docker/horizon/start.sh index 01b1405e7..5f65f72fe 100755 --- a/docker/horizon/start.sh +++ b/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 |