openstack/kolla-ansible
Code Issues Proposed changes

Add config-internal/config-external for horizon

Browse Source 
Partially Implements: Blueprint standard-start

Change-Id: I8a88572a4390824787c663014e6eae52dbb04648
This commit is contained in:
Swapnil Kulkarni 2015-07-06 05:24:47 +00:00
parent 0dbf3e2e11
commit e21c68a69e
6 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/centos/binary/horizon/Dockerfile
View File

@ -12,5 +12,6 @@ RUN yum -y install \
# https://bugzilla.redhat.com/show_bug.cgi?id=1219006 # https://bugzilla.redhat.com/show_bug.cgi?id=1219006
ADD ./start.sh /start.sh ADD ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

1
docker/centos/binary/horizon/config-external.sh Symbolic link
View File

@ -0,0 +1 @@
../../../common/horizon/config-external.sh

1
docker/centos/binary/horizon/config-internal.sh Symbolic link
View File

@ -0,0 +1 @@
../../../common/horizon/config-internal.sh

11
docker/common/horizon/config-external.sh Normal file
View File

@ -0,0 +1,11 @@
#!/bin/bash
SOURCE="/etc/openstack-dashboard/local_settings"
TARGET="/etc/openstack-dashboard/local_settings"
OWNER="horizon"
if [[ -f "$SOURCE" ]]; then
cp $SOURCE $TARGET
chown ${OWNER}: $TARGET
chmod 0644 $TARGET
fi

36
docker/common/horizon/config-internal.sh Normal file
View File

@ -0,0 +1,36 @@
#!/bin/bash
set -e
: ${HORIZON_KEYSTONE_USER:=horizon}
. /opt/kolla/kolla-common.sh
fail_unless_os_service_running keystone
fail_unless_os_service_running glance
fail_unless_os_service_running nova
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
httpdcfg=/etc/httpd/conf.d/openstack-dashboard.conf
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
# Make sure we launch horizon using the default value for WEBROOT, which is
# '/'.
sed -ri '/^WEBROOT =.+/d' $cfg
sed -ri 's,^(WSGIScriptAlias) /dashboard (/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi),\1 / \2,' $httpdcfg
sed -ri 's,^(Alias /dashboard)(/static /usr/share/openstack-dashboard/static),Alias \2,' $httpdcfg
# This step is required because of:
# https://bugzilla.redhat.com/show_bug.cgi?id=1220070
# Running this in the Dockerfile didn't fix the HTTP/500 as a result of the
# missing compress action.
python /usr/share/openstack-dashboard/manage.py compress
/usr/sbin/httpd -DFOREGROUND

38
docker/common/horizon/start.sh
View File

@ -1,36 +1,14 @@
#!/bin/bash #!/bin/bash
set -e
: ${HORIZON_KEYSTONE_USER:=horizon} set -o errexit
. /opt/kolla/kolla-common.sh CMD="/usr/sbin/httpd -DFOREGROUND"
ARGS=""
fail_unless_os_service_running keystone # Loading common functions.
fail_unless_os_service_running glance source /opt/kolla/kolla-common.sh
fail_unless_os_service_running nova
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" # Config-internal script exec out of this function, it does not return here.
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" set_configs
cfg=/etc/openstack-dashboard/local_settings exec $CMD $ARGS
httpdcfg=/etc/httpd/conf.d/openstack-dashboard.conf
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
# Make sure we launch horizon using the default value for WEBROOT, which is
# '/'.
sed -ri '/^WEBROOT =.+/d' $cfg
sed -ri 's,^(WSGIScriptAlias) /dashboard (/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi),\1 / \2,' $httpdcfg
sed -ri 's,^(Alias /dashboard)(/static /usr/share/openstack-dashboard/static),Alias \2,' $httpdcfg
# This step is required because of:
# https://bugzilla.redhat.com/show_bug.cgi?id=1220070
# Running this in the Dockerfile didn't fix the HTTP/500 as a result of the
# missing compress action.
python /usr/share/openstack-dashboard/manage.py compress
/usr/sbin/httpd -DFOREGROUND