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/base/Dockerfile.j2

@@ -188,4 +188,10 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD
 
 {% endif %}
 
-COPY set_configs.py kolla-common.sh /opt/kolla/
+COPY set_configs.py /opt/kolla/
+
+COPY start.sh /usr/local/bin/kolla_start
+RUN touch /usr/local/bin/kolla_extend_start \
+    && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /opt/kolla/set_configs.py
+
+CMD ["kolla_start"]

docker/base/kolla-common.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Copying configs into place if needed and set run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)

docker/base/start.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+# Processing /opt/kolla/config_files/config.json
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
+ARGS=""
+
+# Run additional commands if present
+source kolla_extend_start
+
+echo "Running command: '${CMD}${ARGS:+ $ARGS}'"
+exec ${CMD} ${ARGS}

docker/ceilometer/ceilometer-alarm/Dockerfile.j2

@@ -10,9 +10,4 @@ RUN yum install -y openstack-ceilometer-alarm \
     {% endif %}
 {% endif %}
 
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/ceilometer/ceilometer-alarm/start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/ceilometer-alarm"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS

docker/ceilometer/ceilometer-api/Dockerfile.j2

@@ -4,16 +4,13 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-
 RUN yum install -y openstack-ceilometer-api \
     && yum clean all
 
     {% endif %}
 {% endif %}
 
-COPY ./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 }}

docker/ceilometer/ceilometer-api/extend_start.sh

@@ -1,11 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/ceilometer-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.
@@ -13,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     su -s /bin/sh -c "ceilometer-manage db_sync" ceilometer
     exit 0
 fi
-
-exec $CMD $ARGS

docker/ceilometer/ceilometer-central/Dockerfile.j2

@@ -10,9 +10,4 @@ RUN yum install -y openstack-ceilometer-central \
     {% endif %}
 {% endif %}
 
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/ceilometer/ceilometer-central/start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/ceilometer-agent-central"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS

docker/ceilometer/ceilometer-collector/Dockerfile.j2

@@ -10,9 +10,4 @@ RUN yum install -y openstack-ceilometer-collector \
     {% endif %}
 {% endif %}
 
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/ceilometer/ceilometer-collector/start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/ceilometer-collector"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS

docker/ceilometer/ceilometer-compute/Dockerfile.j2

@@ -4,7 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum install -y openstack-ceilometer-compute \
+RUN yum install -y \
+        openstack-ceilometer-compute \
         python-ceilometerclient \
         python-pecan \
     && yum clean all
@@ -12,9 +13,4 @@ RUN yum install -y openstack-ceilometer-compute \
     {% endif %}
 {% endif %}
 
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/ceilometer/ceilometer-compute/start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/ceilometer-agent-compute"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS

docker/ceilometer/ceilometer-notification/Dockerfile.j2

@@ -10,9 +10,4 @@ RUN yum install -y openstack-ceilometer-notification \
     {% endif %}
 {% endif %}
 
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/ceilometer/ceilometer-notification/start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/ceilometer-agent-notification"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS

docker/ceph/ceph-mon/Dockerfile.j2

@@ -1,7 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY start.sh /
 COPY fetch_ceph_keys.py /usr/bin/
 
-CMD ["/start.sh"]
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/bin/fetch_ceph_keys.py

docker/ceph/ceph-mon/extend_start.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -o errexit
 
 # Setup common paths
 KEYRING_ADMIN="/etc/ceph/ceph.client.admin.keyring"
@@ -7,9 +6,6 @@ KEYRING_MON="/etc/ceph/ceph.client.mon.keyring"
 MONMAP="/etc/ceph/ceph.monmap"
 MON_DIR="/var/lib/ceph/mon/ceph-$(hostname)"
 
-# 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
@@ -37,5 +33,3 @@ if [[ ! -e "${MON_DIR}/keyring" ]]; then
     ceph-mon --mkfs -i "$(hostname)" --monmap "${MONMAP}" --keyring "${KEYRING_TMP}"
     rm "${KEYRING_TMP}"
 fi
-
-exec $CMD

docker/ceph/ceph-osd/Dockerfile.j2

@@ -1,6 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-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

docker/ceph/ceph-osd/extend_start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-# 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.
@@ -44,5 +40,3 @@ fi
 JOURNAL_PARTITION=$(ls "${OSD_DEV}"* | egrep "${OSD_DEV}p?2")
 OSD_DIR="/var/lib/ceph/osd/ceph-${OSD_ID}"
 ARGS="-i ${OSD_ID} --osd-journal ${JOURNAL_PARTITION} -k ${OSD_DIR}/keyring"
-
-exec $CMD $ARGS

docker/cinder/cinder-api/Dockerfile.j2

@@ -10,8 +10,7 @@ RUN yum install -y python-keystone \
     {% 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 }}

docker/cinder/cinder-api/extend_start.sh

@@ -1,14 +1,9 @@
 #!/bin/bash
 set -o errexit
 
-# 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 "cinder-manage db sync" cinder
     exit 0
 fi
-
-exec $CMD

docker/cinder/cinder-backup/Dockerfile.j2

@@ -1,8 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/cinder/cinder-backup/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

docker/cinder/cinder-scheduler/Dockerfile.j2

@@ -1,8 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/cinder/cinder-scheduler/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

docker/cinder/cinder-volume/Dockerfile.j2

@@ -4,15 +4,12 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum install -y lvm2 \
+RUN yum install -y \
+        lvm2 \
         scsi-target-utils \
     && yum clean all
 
     {% endif %}
 {% endif %}
 
-COPY ./start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/cinder/cinder-volume/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

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 }}

docker/designate/designate-api/extend_start.sh

@@ -1,11 +1,4 @@
 #!/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.
@@ -13,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     su -s /bin/sh -c "designate-manage db_sync" designate
     exit 0
 fi
-
-exec $CMD $ARGS

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 }}

docker/designate/designate-backend-bind9/start.sh

@@ -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

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 }}

docker/designate/designate-central/start.sh

@@ -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

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 }}

docker/designate/designate-mdns/start.sh

@@ -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

docker/designate/designate-poolmanager/Dockerfile.j2

@@ -13,9 +13,4 @@ RUN yum install -y \
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/designate/designate-poolmanager/start.sh

@@ -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

docker/designate/designate-sink/Dockerfile.j2

@@ -12,9 +12,4 @@ RUN yum install -y \
     {% endif %}
 {% endif %}
 
-COPY start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/designate/designate-sink/start.sh

@@ -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

docker/glance/glance-api/Dockerfile.j2

@@ -1,8 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-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 }}

docker/glance/glance-api/extend_start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-# 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.
@@ -10,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     su -s /bin/sh -c "glance-manage db_sync" glance
     exit 0
 fi
-
-exec $CMD

docker/glance/glance-registry/Dockerfile.j2

@@ -1,8 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/glance/glance-registry/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

docker/gnocchi/gnocchi-api/Dockerfile.j2

@@ -13,9 +13,7 @@ RUN yum install -y \
     {% endif %}
 {% endif %}
 
-COPY 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 }}

docker/gnocchi/gnocchi-api/extend_start.sh

@@ -1,11 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/gnocchi-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.
@@ -13,6 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     su -s /bin/sh -c "gnocchi-manage db_sync" gnocchi
     exit 0
 fi
-
-exec $CMD $ARGS
-

docker/gnocchi/gnocchi-statsd/Dockerfile.j2

@@ -10,9 +10,4 @@ RUN yum install -y openstack-gnocchi-statsd \
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/gnocchi/gnocchi-statsd/start.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/gnocchi-statsd"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS
-

docker/haproxy/Dockerfile.j2

@@ -19,9 +19,9 @@ RUN apt-get install -y --no-install-recommends haproxy \
 
 {% endif %}
 
-COPY start.sh /
 COPY ensure_latest_config.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 /opt/kolla/ensure_latest_config.sh
 
 {{ include_footer }}

docker/haproxy/extend_start.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
 # We are intentionally not using exec so we can reload the haproxy config later
+echo "Running command: '${CMD}'"
 $CMD
 
 # TODO(SamYaple): This has the potential for a race condition triggered by a
@@ -12,3 +8,6 @@ $CMD
 while [[ -e "/proc/$(cat /run/haproxy.pid)" ]]; do
     sleep 5
 done
+
+# Based on the above loop this point should never be reached
+exit 1

docker/heat/heat-api-cfn/Dockerfile.j2

@@ -10,8 +10,4 @@ RUN yum -y install openstack-heat-api-cfn \
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/heat/heat-api-cfn/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

docker/heat/heat-api/Dockerfile.j2

@@ -10,8 +10,7 @@ RUN yum -y install openstack-heat-api \
     {% 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 }}

docker/heat/heat-api/extend_start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-# 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.
@@ -13,5 +9,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     openstack role add --domain heat_user_domain --user heat_domain_admin admin
     exit 0
 fi
-
-exec $CMD

docker/heat/heat-engine/Dockerfile.j2

@@ -15,8 +15,4 @@ RUN yum -y install \
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/horizon/Dockerfile.j2

@@ -56,8 +56,7 @@ RUN ln -s horizon-source/* horizon \
 
 {% 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 }}

docker/horizon/extend_start.sh

@@ -1,13 +1,7 @@
 #!/bin/bash
-set -o errexit
-
-# Loading common functions
-source /opt/kolla/kolla-common.sh
 
 if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
         "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
     # Loading Apache2 ENV variables
     source /etc/apache2/envvars
 fi
-
-exec $CMD

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 }}

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

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 }}

docker/ironic/ironic-conductor/start.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

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 }}

docker/ironic/ironic-discoverd/start.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

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 }}

docker/ironic/ironic-pxe/start.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

docker/keepalived/Dockerfile.j2

@@ -18,8 +18,9 @@ RUN apt-get install -y --no-install-recommends \
 
 {% endif %}
 
-COPY start.sh check_alive.sh /
+COPY check_alive.sh /
 
-CMD ["/start.sh"]
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh
 
 {{ include_footer }}

docker/keepalived/extend_start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
 
 modprobe ip_vs
 
@@ -10,5 +6,3 @@ modprobe ip_vs
 if [ -f /run/keepalived.pid ]; then
     rm /run/keepalived.pid
 fi
-
-exec $CMD

docker/keystone/Dockerfile.j2

@@ -50,8 +50,7 @@ RUN ln -s keystone-source/* keystone \
 RUN chown -R keystone: /var/www/cgi-bin/keystone \
     && chmod 755 /var/www/cgi-bin/keystone/*
 
-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 }}

docker/keystone/extend_start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-# Loading common functions
-source /opt/kolla/kolla-common.sh
 
 if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
         "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
@@ -32,5 +28,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
 fi
 
 ARGS="-DFOREGROUND"
-echo "Running command: ${CMD} ${ARGS}"
-exec $CMD $ARGS

docker/logging/rsyslog/Dockerfile.j2

@@ -3,15 +3,14 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install \
-        rsyslog \
+RUN yum -y install rsyslog \
     && yum clean all
+
 {% elif base_distro in ['ubuntu', 'debian'] %}
-RUN apt-get install -y --no-install-recommends \
-       rsyslog \
+
+RUN apt-get install -y --no-install-recommends rsyslog \
     && apt-get clean
+
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
+{{ include_footer }}

docker/logging/rsyslog/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS

docker/magnum/magnum-api/Dockerfile.j2

@@ -10,10 +10,7 @@ RUN yum -y install openstack-magnum-api \
     {% endif %}
 {% endif %}
 
-COPY ./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 }}

docker/magnum/magnum-api/extend_start.sh

@@ -1,11 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/magnum-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.
@@ -13,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     su -s /bin/sh -c "magnum-manage db_sync" magnum
     exit 0
 fi
-
-exec $CMD $ARGS

docker/magnum/magnum-conductor/Dockerfile.j2

@@ -4,7 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install openstack-magnum-conductor \
+RUN yum -y install \
+        openstack-magnum-conductor \
         tar \
     && yum clean all
 
@@ -14,10 +15,4 @@ RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/release
     {% endif %}
 {% endif %}
 
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-
 {{ include_footer }}

docker/magnum/magnum-conductor/start.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/magnum-conductor"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS

docker/mariadb/Dockerfile.j2

@@ -28,9 +28,7 @@ RUN apt-get install -y --no-install-recommends \
 
 {% endif %}
 
-COPY config-galera.sh /opt/kolla/config/
-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 }}

docker/mariadb/extend_start.sh

@@ -31,6 +31,12 @@ function bootstrap_db {
     mysqladmin -p"${DB_ROOT_PASSWORD}" shutdown
 }
 
-function populate_db {
+chown mysql: /var/lib/mysql
+
+# This catches all cases of the BOOTSTRAP variable being set, including empty
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; then
+    ARGS="--wsrep-new-cluster"
+    touch /var/lib/mysql/cluster.exists
     mysql_install_db --user=mysql
-}
+    bootstrap_db
+fi

docker/mariadb/start.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions
-source /opt/kolla/kolla-common.sh
-source /opt/kolla/config/config-galera.sh
-
-chown mysql: /var/lib/mysql
-
-# This catches all cases of the BOOTSTRAP variable being set, including empty
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; then
-    ARGS="--wsrep-new-cluster"
-    touch /var/lib/mysql/cluster.exists
-    populate_db
-    bootstrap_db
-    exec $CMD $ARGS
-    exit 0
-fi
-
-exec $CMD

docker/memcached/Dockerfile.j2

@@ -13,8 +13,4 @@ RUN apt-get install -y --no-install-recommends memcached \
 
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/memcached/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

docker/mongodb/Dockerfile.j2

@@ -17,9 +17,7 @@ RUN apt-get install -y --no-install-recommends mongodb-server \
 
 RUN mkdir -p /data/db
 
-VOLUME /data/db
-VOLUME /var/log/mongodb
-
-ENTRYPOINT exec /bin/mongod --dbpath /data/db --logpath /var/log/mongodb/mongo.log --noprealloc --smallfiles
+# TODO(SamYaple): updated mongodb to match the rest of Kolla
+#ENTRYPOINT exec /bin/mongod --dbpath /data/db --logpath /var/log/mongodb/mongo.log --noprealloc --smallfiles
 
 {{ include_footer }}

docker/murano/murano-api/Dockerfile.j2

@@ -1,8 +1,7 @@
 FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-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 }}

docker/murano/murano-api/extend_start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-# 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.
@@ -10,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     su -s /bin/sh -c "murano-db-manage --config-file /etc/murano/murano.conf upgrade" murano
     exit 0
 fi
-
-exec $CMD

docker/murano/murano-engine/Dockerfile.j2

@@ -1,8 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/murano/murano-engine/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD

docker/neutron/neutron-agents/Dockerfile.j2

@@ -31,6 +31,7 @@ COPY fwaas_driver.ini /etc/neutron/
 COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent
 COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
 COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent
+COPY config-sudoers.sh /opt/kolla/
 
 COPY start.sh /
 

docker/neutron/neutron-agents/start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit
 
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
+# Processing /opt/kolla/config_files/config.json
+python /opt/kolla/set_configs.py
 
 exec /usr/bin/supervisord

docker/neutron/neutron-base/Dockerfile.j2

@@ -40,4 +40,5 @@ RUN ln -s neutron-base-source/* neutron \
 
 {% endif %}
 
-COPY config-sudoers.sh /opt/kolla/
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start

docker/neutron/neutron-base/extend_start.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Neutron uses rootwrap which requires a tty for sudo.
+# Since the container is running in daemon mode, a tty
+# is not present and requiretty must be commented out.
+if [ ! -f /sudo-modified ]; then
+    chmod 0640 /etc/sudoers
+    sed -i '/Defaults    requiretty/s/^/#/' /etc/sudoers
+    chmod 0440 /etc/sudoers
+    touch /sudo-modified
+fi

docker/neutron/neutron-base/ip_wrapper.py

@@ -19,7 +19,9 @@
 # access all of the neutron network namespaces as well as all
 # containers that bind mount /run/netns from the host.
 
-# This is required for "thin" neutron containers to function properly
+# This is required for "thin" neutron containers to function properly. However,
+# due to a missing feature/bug in Docker it is not possible to use this script
+# at this time. Once Docker updates with this feature we will usre this again.
 
 import nsenter
 import subprocess

docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2

@@ -15,13 +15,10 @@ RUN yum install -y \
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
 # Install required packages
-RUN yum install -y ebtables && yum clean all
+RUN yum install -y ebtables \
+    && yum clean all
 
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/neutron/neutron-linuxbridge-agent/start.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-source /opt/kolla/config-sudoers.sh
-
-exec $CMD

docker/neutron/neutron-openvswitch-agent/Dockerfile.j2

@@ -15,15 +15,10 @@ RUN yum install -y \
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
 # Install required packages
-RUN yum install -y \
-        openvswitch \
+RUN yum install -y openvswitch \
     && yum clean all
 
     {% endif %}
 {% endif %}
 
-COPY start.sh /
-
-CMD ["/start.sh"]
-
 {{ include_footer }}

docker/neutron/neutron-openvswitch-agent/start.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-source /opt/kolla/config-sudoers.sh
-
-exec $CMD

docker/neutron/neutron-server/Dockerfile.j2

@@ -23,8 +23,7 @@ RUN yum install -y which \
     {% 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 }}

docker/neutron/neutron-server/extend_start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-set -o errexit
-
-# 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.
@@ -11,4 +7,12 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     exit 0
 fi
 
-exec $CMD
+# Neutron uses rootwrap which requires a tty for sudo.
+# Since the container is running in daemon mode, a tty
+# is not present and requiretty must be commented out.
+if [ ! -f /sudo-modified ]; then
+    chmod 0640 /etc/sudoers
+    sed -i '/Defaults    requiretty/s/^/#/' /etc/sudoers
+    chmod 0440 /etc/sudoers
+    touch /sudo-modified
+fi

docker/nova/nova-api/Dockerfile.j2

@@ -10,8 +10,7 @@ RUN yum -y install openstack-nova-api \
     {% 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 }}