From 13062e23e86b5d86020949754540460cb5b0b4fe Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 13 May 2015 06:46:24 -0500
Subject: 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
---
 docker/nova-controller/nova-api/Dockerfile         | 10 -----
 docker/nova-controller/nova-api/build              |  1 -
 docker/nova-controller/nova-api/check.sh           | 17 --------
 docker/nova-controller/nova-api/start.sh           | 46 ----------------------
 docker/nova-controller/nova-conductor/Dockerfile   |  8 ----
 docker/nova-controller/nova-conductor/build        |  1 -
 docker/nova-controller/nova-conductor/start.sh     | 24 -----------
 docker/nova-controller/nova-consoleauth/Dockerfile |  8 ----
 docker/nova-controller/nova-consoleauth/build      |  1 -
 docker/nova-controller/nova-consoleauth/start.sh   | 11 ------
 docker/nova-controller/nova-novncproxy/Dockerfile  | 10 -----
 docker/nova-controller/nova-novncproxy/build       |  1 -
 docker/nova-controller/nova-novncproxy/start.sh    | 22 -----------
 docker/nova-controller/nova-scheduler/Dockerfile   |  8 ----
 docker/nova-controller/nova-scheduler/build        |  1 -
 docker/nova-controller/nova-scheduler/start.sh     | 15 -------
 16 files changed, 184 deletions(-)
 delete mode 100644 docker/nova-controller/nova-api/Dockerfile
 delete mode 120000 docker/nova-controller/nova-api/build
 delete mode 100755 docker/nova-controller/nova-api/check.sh
 delete mode 100755 docker/nova-controller/nova-api/start.sh
 delete mode 100644 docker/nova-controller/nova-conductor/Dockerfile
 delete mode 120000 docker/nova-controller/nova-conductor/build
 delete mode 100755 docker/nova-controller/nova-conductor/start.sh
 delete mode 100644 docker/nova-controller/nova-consoleauth/Dockerfile
 delete mode 120000 docker/nova-controller/nova-consoleauth/build
 delete mode 100755 docker/nova-controller/nova-consoleauth/start.sh
 delete mode 100644 docker/nova-controller/nova-novncproxy/Dockerfile
 delete mode 120000 docker/nova-controller/nova-novncproxy/build
 delete mode 100755 docker/nova-controller/nova-novncproxy/start.sh
 delete mode 100644 docker/nova-controller/nova-scheduler/Dockerfile
 delete mode 120000 docker/nova-controller/nova-scheduler/build
 delete mode 100755 docker/nova-controller/nova-scheduler/start.sh

(limited to 'docker/nova-controller')

diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile
deleted file mode 100644
index 7abd32087..000000000
--- a/docker/nova-controller/nova-api/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 \
-        openstack-nova-api && yum clean all
-
-ADD ./start.sh /start.sh
-ADD ./check.sh /check.sh
-
-CMD ["/start.sh"]
diff --git a/docker/nova-controller/nova-api/build b/docker/nova-controller/nova-api/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-api/check.sh b/docker/nova-controller/nova-api/check.sh
deleted file mode 100755
index b250682d8..000000000
--- a/docker/nova-controller/nova-api/check.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-RES=0
-
-. /openrc
-if ! keystone token-get > /dev/null; then
-    echo "ERROR: keystone token-get failed" >&2
-    RES=1
-else
-    if ! nova list > /dev/null; then
-        echo "ERROR: nova list failed" >&2
-        RES=1
-    fi
-fi
-
-exit $RES
-
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh
deleted file mode 100755
index 7928370a4..000000000
--- a/docker/nova-controller/nova-api/start.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/config-nova.sh
-
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
-                    NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \
-                    ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \
-                    NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME
-fail_unless_os_service_running keystone
-fail_unless_db $NOVA_DB_NAME
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
-
-cfg=/etc/nova/nova.conf
-
-# configure logging
-crudini --set $cfg DEFAULT log_file "${NOVA_API_LOG_FILE}"
-
-crux user-create --update \
-    -n "${NOVA_KEYSTONE_USER}" \
-    -p "${NOVA_KEYSTONE_PASSWORD}" \
-    -t "${ADMIN_TENANT_NAME}" \
-    -r admin
-
-crux endpoint-create --remove-all \
-    -n ec2 -t ec2 \
-    -I "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Cloud" \
-    -P "http://${PUBLIC_IP}:8773/services/Cloud" \
-    -A "http://${NOVA_EC2_API_SERVICE_HOST}:8773/services/Admin"
-
-crux endpoint-create --remove-all \
-    -n nova -t compute \
-    -I "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s" \
-    -P "http://${PUBLIC_IP}:8774/v2/\$(tenant_id)s" \
-    -A "http://${NOVA_API_SERVICE_HOST}:8774/v2/\$(tenant_id)s"
-
-crux endpoint-create --remove-all \
-    -n novav3 -t computev3 \
-    -I "http://${NOVA_API_SERVICE_HOST}:8774/v3" \
-    -P "http://${PUBLIC_IP}:8774/v3" \
-    -A "http://${NOVA_API_SERVICE_HOST}:8774/v3"
-
-exec /usr/bin/nova-api --config-file /etc/nova/nova.conf
diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/nova-controller/nova-conductor/Dockerfile
deleted file mode 100644
index f91113bad..000000000
--- a/docker/nova-controller/nova-conductor/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-conductor && yum clean all
-
-ADD ./start.sh /start.sh
-CMD ["/start.sh"]
diff --git a/docker/nova-controller/nova-conductor/build b/docker/nova-controller/nova-conductor/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-conductor/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh
deleted file mode 100755
index 5e01b7f30..000000000
--- a/docker/nova-controller/nova-conductor/start.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/config-nova.sh
-
-check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD
-fail_unless_db
-
-cfg=/etc/nova/nova.conf
-
-# configure logging
-crudini --set $cfg DEFAULT log_file "${NOVA_CONDUCTOR_LOG_FILE}"
-
-mysql -h ${MARIADB_SERVICE_HOST} -u root \
-	-p${DB_ROOT_PASSWORD} mysql <<EOF
-CREATE DATABASE IF NOT EXISTS ${NOVA_DB_NAME};
-GRANT ALL PRIVILEGES ON ${NOVA_DB_NAME}.* TO
-	'${NOVA_DB_USER}'@'%' IDENTIFIED BY '${NOVA_DB_PASSWORD}'
-EOF
-
-nova-manage db sync
-
-exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf
diff --git a/docker/nova-controller/nova-consoleauth/Dockerfile b/docker/nova-controller/nova-consoleauth/Dockerfile
deleted file mode 100644
index 576c91b5a..000000000
--- a/docker/nova-controller/nova-consoleauth/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install openstack-nova-console && yum clean all
-
-ADD start.sh /start.sh
-
-CMD ["/start.sh"]
diff --git a/docker/nova-controller/nova-consoleauth/build b/docker/nova-controller/nova-consoleauth/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-consoleauth/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-consoleauth/start.sh b/docker/nova-controller/nova-consoleauth/start.sh
deleted file mode 100755
index a1b0864ac..000000000
--- a/docker/nova-controller/nova-consoleauth/start.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-. /opt/kolla/config-nova.sh
-
-cfg=/etc/nova/nova.conf
-
-crudini --set $cfg DEFAULT log_file "${NOVA_CONSOLEAUTH_LOG_FILE}"
-
-echo Starting nova-consoleauth
-exec /usr/bin/nova-consoleauth
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
diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/nova-controller/nova-scheduler/Dockerfile
deleted file mode 100644
index 2eec47554..000000000
--- a/docker/nova-controller/nova-scheduler/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum -y install \
-        openstack-nova-scheduler && yum clean all
-
-ADD ./start.sh /start.sh
-CMD ["/start.sh"]
diff --git a/docker/nova-controller/nova-scheduler/build b/docker/nova-controller/nova-scheduler/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/nova-controller/nova-scheduler/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh
deleted file mode 100755
index 504c049ed..000000000
--- a/docker/nova-controller/nova-scheduler/start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/config-nova.sh
-
-check_required_vars NOVA_DB_NAME
-fail_unless_db $NOVA_DB_NAME
-
-cfg=/etc/nova/nova.conf
-
-# configure logging
-crudini --set $cfg DEFAULT log_file "${NOVA_SCHEDULER_LOG_FILE}"
-
-exec /usr/bin/nova-scheduler --config-file /etc/nova/nova.conf
-- 
cgit v1.2.3