diff options
| author | Sam Yaple <sam@yaple.net> | 2015-05-13 06:46:24 -0500 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-05-15 01:32:22 -0500 |
| commit | 13062e23e86b5d86020949754540460cb5b0b4fe (patch) | |
| tree | e0b3c8411418949a3d8df221da7c8cb2831b6d5d /docker/nova-controller/nova-novncproxy | |
| parent | 354ba01c8f5c7e1695cbea3bfc07aee5b75e76d9 (diff) | |
| download | kolla-13062e23e86b5d86020949754540460cb5b0b4fe.tar.gz kolla-13062e23e86b5d86020949754540460cb5b0b4fe.zip | |
Restructure builds to allow more flexibility
As a restructure, nothing is changed from the original behaviour and
naming despite the file structure changing. The symlinks to build had
to be updated generating lots of "deleted" and "new_file".
The new structure is:
docker/${base_distro}/${type}/${container}
base_distro == centos, ubuntu, fedora, etc
type == source, binary, rdo
type rdo is a symlink to binary for backwards compatibility
Two new flags are added to the build-all script to support the ability
to support different base distros and a flag to support binary or source
containers.
There are several added folders that are empty to hold the directory
structure for future containers of these types.
To use a prefix other than centos-rdo- you can set PREFIX in the toplevel
directory .buildconf file
Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90
Diffstat (limited to 'docker/nova-controller/nova-novncproxy')
| -rw-r--r-- | docker/nova-controller/nova-novncproxy/Dockerfile | 10 | ||||
| l--------- | docker/nova-controller/nova-novncproxy/build | 1 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-novncproxy/start.sh | 22 |
3 files changed, 0 insertions, 33 deletions
diff --git a/docker/nova-controller/nova-novncproxy/Dockerfile b/docker/nova-controller/nova-novncproxy/Dockerfile deleted file mode 100644 index 682625853..000000000 --- a/docker/nova-controller/nova-novncproxy/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - novnc openstack-nova-novncproxy && \ - yum clean all - -ADD start.sh /start.sh - -CMD ["/start.sh"] diff --git a/docker/nova-controller/nova-novncproxy/build b/docker/nova-controller/nova-novncproxy/build deleted file mode 120000 index 43944faa0..000000000 --- a/docker/nova-controller/nova-novncproxy/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/nova-controller/nova-novncproxy/start.sh b/docker/nova-controller/nova-novncproxy/start.sh deleted file mode 100755 index 9edafbca3..000000000 --- a/docker/nova-controller/nova-novncproxy/start.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -e -. /opt/kolla/kolla-common.sh - -cfg=/etc/nova/nova.conf - -check_required_vars PUBLIC_IP NOVA_NOVNC_PROXY_SERVICE_HOST NOVA_NOVNC_PROXY_PORT \ - NOVA_NOVNC_BASE_ADDRESS NOVA_VNCSERVER_LISTEN_ADDRESS \ - NOVA_VNCSERVER_PROXYCLIENT_ADDRESS - -crudini --set $cfg DEFAULT log_file "${NOVA_NOVNCPROXY_LOG_FILE}" - -# Listen on all interfaces on port $NOVA_NOVNC_PROXY_PORT for incoming novnc -# requests. -# The base_url is given to clients to connect to, like Horizon, so this could -# very well be fancy DNS name. -echo Configuring VNC... -crudini --set $cfg DEFAULT vncserver_listen "${NOVA_VNCSERVER_LISTEN_ADDRESS}" -crudini --set $cfg DEFAULT vncserver_proxyclient_address "${NOVA_VNCSERVER_PROXYCLIENT_ADDRESS}" - -echo Starting nova-novncproxy -exec /usr/bin/nova-novncproxy |