Merge "Remove duplicate code in magnum extend_start.sh"

docker/magnum/magnum-api/Dockerfile.j2

@@ -10,8 +10,8 @@ RUN yum -y install openstack-magnum-api \
     {% endif %}
 {% endif %}
 
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
+COPY extend_start.sh /usr/local/bin/kolla_magnum_extend_start
+RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start
 
 {{ include_footer }}
 

docker/magnum/magnum-api/extend_start.sh

 #!/bin/bash
 
-if [[ ! -d "/var/log/kolla/magnum" ]]; then
-    mkdir -p /var/log/kolla/magnum
-fi
-if [[ $(stat -c %a /var/log/kolla/magnum) != "755" ]]; then
-    chmod 755 /var/log/kolla/magnum
-fi
-
 # 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

docker/magnum/magnum-base/Dockerfile.j2

@@ -24,4 +24,5 @@ RUN ln -s magnum-base-source/* magnum \
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN usermod -a -G kolla magnum \
-    && chmod 755 /usr/local/bin/kolla_extend_start
+    && touch /usr/local/bin/kolla_magnum_extend_start \
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_magnum_extend_start

docker/magnum/magnum-base/extend_start.sh

@@ -6,3 +6,5 @@ fi
 if [[ $(stat -c %a /var/log/kolla/magnum) != "755" ]]; then
     chmod 755 /var/log/kolla/magnum
 fi
+
+source /usr/local/bin/kolla_magnum_extend_start