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-consoleauth/Dockerfile |  8 --------
 docker/nova-controller/nova-consoleauth/build      |  1 -
 docker/nova-controller/nova-consoleauth/start.sh   | 11 -----------
 3 files changed, 20 deletions(-)
 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

(limited to 'docker/nova-controller/nova-consoleauth')

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
-- 
cgit v1.2.3