From cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 30 Sep 2015 11:23:39 +0000
Subject: Common start.sh

The majority of the start.sh code is identical. This removes that
duplicate code while still maintaining the ability to call code in a
specific container.

The start.sh is moved into /usr/local/bin/kolla_start in the container

The extend_start.sh script is called by the kolla_start script at the
location /usr/local/bin/kolla_extend_start . It always exists because
we create a noop kolla_extend_start in the base directory. We override
it with extend_start.sh in a specific image should we need to.

Of note, the neutron-agents container is exempt from this new
structure due to it being a fat container.

Additionally, we fix the inconsistent permissions throughout. 644 for
repo files and the scripts are set to 755 via a Docker RUN command to
ensure someones local perm change won't break upstream containers.

Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad
Closes-Bug: #1501295
---
 docker/designate/designate-api/Dockerfile.j2           |  6 ++----
 docker/designate/designate-api/extend_start.sh         |  8 ++++++++
 docker/designate/designate-api/start.sh                | 17 -----------------
 docker/designate/designate-backend-bind9/Dockerfile.j2 |  5 -----
 docker/designate/designate-backend-bind9/start.sh      | 10 ----------
 docker/designate/designate-central/Dockerfile.j2       |  8 +-------
 docker/designate/designate-central/start.sh            | 10 ----------
 docker/designate/designate-mdns/Dockerfile.j2          |  5 -----
 docker/designate/designate-mdns/start.sh               | 10 ----------
 docker/designate/designate-poolmanager/Dockerfile.j2   |  9 ++-------
 docker/designate/designate-poolmanager/start.sh        | 10 ----------
 docker/designate/designate-sink/Dockerfile.j2          |  9 ++-------
 docker/designate/designate-sink/start.sh               | 10 ----------
 13 files changed, 15 insertions(+), 102 deletions(-)
 create mode 100644 docker/designate/designate-api/extend_start.sh
 delete mode 100755 docker/designate/designate-api/start.sh
 delete mode 100755 docker/designate/designate-backend-bind9/start.sh
 delete mode 100755 docker/designate/designate-central/start.sh
 delete mode 100755 docker/designate/designate-mdns/start.sh
 delete mode 100755 docker/designate/designate-poolmanager/start.sh
 delete mode 100755 docker/designate/designate-sink/start.sh

(limited to 'docker/designate')

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index f0b8ea6cf..4f7e25634 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -11,9 +11,7 @@ RUN yum install -y \
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}
diff --git a/docker/designate/designate-api/extend_start.sh b/docker/designate/designate-api/extend_start.sh
new file mode 100644
index 000000000..8fda9197b
--- /dev/null
+++ b/docker/designate/designate-api/extend_start.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    su -s /bin/sh -c "designate-manage db_sync" designate
+    exit 0
+fi
diff --git a/docker/designate/designate-api/start.sh b/docker/designate/designate-api/start.sh
deleted file mode 100755
index 816715fa9..000000000
--- a/docker/designate/designate-api/start.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/designate-api"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    su -s /bin/sh -c "designate-manage db_sync" designate
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index f163c7b98..843209214 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -11,9 +11,4 @@ RUN yum install -y bind \
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}
diff --git a/docker/designate/designate-backend-bind9/start.sh b/docker/designate/designate-backend-bind9/start.sh
deleted file mode 100755
index bd3f8c401..000000000
--- a/docker/designate/designate-backend-bind9/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/sbin/named"
-ARGS="-u named -g"
-
-# Execute config strategy
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index 01ddbbfd0..7ff039975 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -4,16 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum install -y \
-    openstack-designate-central \
+RUN yum install -y openstack-designate-central \
     && yum clean all
 
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}
diff --git a/docker/designate/designate-central/start.sh b/docker/designate/designate-central/start.sh
deleted file mode 100755
index 760f7eacd..000000000
--- a/docker/designate/designate-central/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/designate-central"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index fdb2d0c1d..6c2125f30 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -10,9 +10,4 @@ RUN yum install -y openstack-designate-mdns \
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}
diff --git a/docker/designate/designate-mdns/start.sh b/docker/designate/designate-mdns/start.sh
deleted file mode 100755
index 026e8e6c3..000000000
--- a/docker/designate/designate-mdns/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/designate-mdns"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS
diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2
index 1d8df60ad..ad4b428d5 100644
--- a/docker/designate/designate-poolmanager/Dockerfile.j2
+++ b/docker/designate/designate-poolmanager/Dockerfile.j2
@@ -6,16 +6,11 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
 
 # The bind9 package here is only to provide the rndc binary.
 RUN yum install -y \
-    openstack-designate-pool-manager \
-    bind \
+        openstack-designate-pool-manager \
+        bind \
     && yum clean all
 
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}
diff --git a/docker/designate/designate-poolmanager/start.sh b/docker/designate/designate-poolmanager/start.sh
deleted file mode 100755
index a648b9b37..000000000
--- a/docker/designate/designate-poolmanager/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/designate-pool-manager"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index bc4fa45c9..6c4a3ea40 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -5,16 +5,11 @@ MAINTAINER Kolla Project (https://launchpad.net.kolla)
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
 RUN yum install -y \
-    openstack-designate-sink \
-    python-designateclient \
+        openstack-designate-sink \
+        python-designateclient \
     && yum clean all
 
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}
diff --git a/docker/designate/designate-sink/start.sh b/docker/designate/designate-sink/start.sh
deleted file mode 100755
index 94c70470c..000000000
--- a/docker/designate/designate-sink/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/designate-sink"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS
-- 
cgit v1.2.3