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

8 files changed, 2 insertions, 37 deletions

diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 016b3560b..6b726a419 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -13,8 +13,7 @@ RUN VER_TO_GET=$(yum --showduplicates list openstack-ironic-api | awk '/delorean
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-
-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/ironic/ironic-api/start.sh b/docker/ironic/ironic-api/extend_start.sh
index 60b3ea5a0..bbbe5c7e1 100755..100644
--- a/docker/ironic/ironic-api/start.sh
+++ b/docker/ironic/ironic-api/extend_start.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-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.
@@ -9,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     su -s /bin/sh -c "ironic-dbsync upgrade" ironic
     exit 0
 fi
-
-exec $CMD
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 7fe401b4d..1a0976312 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -13,8 +13,4 @@ RUN VER_TO_GET=$(yum --showduplicates list openstack-ironic-conductor | awk '/de
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}
diff --git a/docker/ironic/ironic-conductor/start.sh b/docker/ironic/ironic-conductor/start.sh
deleted file mode 100755
index e6b7c5bb5..000000000
--- a/docker/ironic/ironic-conductor/start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-source /opt/kolla/kolla-common.sh
-
-exec $CMD
diff --git a/docker/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2
index 6dd9a68b3..f666eb6f0 100644
--- a/docker/ironic/ironic-discoverd/Dockerfile.j2
+++ b/docker/ironic/ironic-discoverd/Dockerfile.j2
@@ -13,8 +13,4 @@ RUN pip install ironic-discoverd
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}
diff --git a/docker/ironic/ironic-discoverd/start.sh b/docker/ironic/ironic-discoverd/start.sh
deleted file mode 100755
index e6b7c5bb5..000000000
--- a/docker/ironic/ironic-discoverd/start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-source /opt/kolla/kolla-common.sh
-
-exec $CMD
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index 59e80e6df..cf0604052 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -23,8 +23,5 @@ RUN apt-get install --no-install-recommends \
 {% endif %}
 
 COPY tftp-map-file /tftpboot/map-file
-COPY start.sh /
-
-CMD ["/start.sh"]
 
 {{ include_footer }}
diff --git a/docker/ironic/ironic-pxe/start.sh b/docker/ironic/ironic-pxe/start.sh
deleted file mode 100755
index e6b7c5bb5..000000000
--- a/docker/ironic/ironic-pxe/start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-source /opt/kolla/kolla-common.sh
-
-exec $CMD