Merge "adjust permissions on _extend_start files (part II)"

docker/aodh/aodh-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start
-RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start
+RUN chmod 644 /usr/local/bin/kolla_aodh_extend_start
 
 {% block aodh_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/barbican/barbican-api/Dockerfile.j2

@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 COPY extend_start.sh /usr/local/bin/kolla_barbican_extend_start
 
-RUN chmod 755 /usr/local/bin/kolla_barbican_extend_start
+RUN chmod 644 /usr/local/bin/kolla_barbican_extend_start
 
 {% block barbican_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/blazar/blazar-api/Dockerfile.j2

@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% block blazar_api_header %}{% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_blazar_extend_start
-RUN chmod 755 /usr/local/bin/kolla_blazar_extend_start
+RUN chmod 644 /usr/local/bin/kolla_blazar_extend_start
 
 {% block blazar_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/ceilometer/ceilometer-notification/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start
-RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start
+RUN chmod 644 /usr/local/bin/kolla_ceilometer_extend_start
 
 {% block ceilometer_notification_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/cinder/cinder-api/Dockerfile.j2

@@ -16,7 +16,7 @@ COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
 
 RUN mkdir -p /var/www/cgi-bin/cinder \
     && cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \
-    && chmod 755 /usr/local/bin/kolla_cinder_extend_start \
+    && chmod 644 /usr/local/bin/kolla_cinder_extend_start \
     && chown -R cinder: /var/www/cgi-bin/cinder \
     && chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi
 

docker/cinder/cinder-volume/Dockerfile.j2

@@ -46,7 +46,7 @@ COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
 
 RUN chmod 750 /etc/sudoers.d \
     && chmod 440 /etc/sudoers.d/kolla_cinder_volume_sudoers \
-    && chmod 755 /usr/local/bin/kolla_cinder_extend_start
+    && chmod 644 /usr/local/bin/kolla_cinder_extend_start
 
 {% block cinder_volume_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/cloudkitty/cloudkitty-api/Dockerfile.j2

@@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}
 
 COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start
-RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start
+RUN chmod 644 /usr/local/bin/kolla_cloudkitty_extend_start
 
 {% block cloudkitty_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/cyborg/cyborg-api/Dockerfile.j2

@@ -11,7 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(cyborg_api_packages | customizable("packages")) }}
 
 COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start
-RUN chmod 755 /usr/local/bin/kolla_cyborg_extend_start
+RUN chmod 644 /usr/local/bin/kolla_cyborg_extend_start
 
 {% block cyborg_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/designate/designate-central/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_designate_extend_start
-RUN chmod 755 /usr/local/bin/kolla_designate_extend_start
+RUN chmod 644 /usr/local/bin/kolla_designate_extend_start
 
 {% block designate_central_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/freezer/freezer-api/Dockerfile.j2

@@ -23,7 +23,7 @@ COPY extend_start.sh /usr/local/bin/kolla_freezer_extend_start
 RUN ln -s freezer-api-source/* freezer-api \
     && {{ macros.install_pip(freezer_api_pip_packages | customizable("pip_packages")) }} \
     && cp -r /freezer-api/etc/freezer/* /etc/freezer/ \
-    && chmod 755 /usr/local/bin/kolla_freezer_extend_start
+    && chmod 644 /usr/local/bin/kolla_freezer_extend_start
 
 {% block freezer_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/glance/glance-api/Dockerfile.j2

@@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(glance_api_packages | customizable("packages")) }}
 
 COPY extend_start.sh /usr/local/bin/kolla_glance_extend_start
-RUN chmod 755 /usr/local/bin/kolla_glance_extend_start
+RUN chmod 644 /usr/local/bin/kolla_glance_extend_start
 
 {% block glance_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/gnocchi/gnocchi-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start
-RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start
+RUN chmod 644 /usr/local/bin/kolla_gnocchi_extend_start
 
 {% block gnocchi_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

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

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
-RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
+RUN chmod 644 /usr/local/bin/kolla_heat_extend_start
 
 {% block heat_api_cfn_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/heat/heat-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start
-RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
+RUN chmod 644 /usr/local/bin/kolla_heat_extend_start
 
 {% block heat_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/ironic/ironic-api/Dockerfile.j2

@@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
 
 COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
-RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
+RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start
 
 {% block ironic_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/ironic/ironic-pxe/Dockerfile.j2

@@ -47,7 +47,7 @@ ENV TFTPBOOT_PATH=/tftpboot \
     HTTPBOOT_PATH=/httpboot
 COPY tftp-map-file-template /map-file-template
 COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
-RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
+RUN chmod 644 /usr/local/bin/kolla_ironic_extend_start
 
 {% block ironic_pxe_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/magnum/magnum-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_magnum_extend_start
-RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start
+RUN chmod 644 /usr/local/bin/kolla_magnum_extend_start
 
 {% block magnum_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/manila/manila-api/Dockerfile.j2

@@ -15,7 +15,7 @@ COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
 
 RUN mkdir -p /var/www/cgi-bin/manila \
     && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi \
-    && chmod 755 /usr/local/bin/kolla_manila_extend_start \
+    && chmod 644 /usr/local/bin/kolla_manila_extend_start \
     && chown -R manila: /var/www/cgi-bin/manila \
     && chmod 755 /var/www/cgi-bin/manila/manila-wsgi
 

docker/masakari/masakari-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_masakari_extend_start
-RUN chmod 755 /usr/local/bin/kolla_masakari_extend_start
+RUN chmod 644 /usr/local/bin/kolla_masakari_extend_start
 
 {% block masakari_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/mistral/mistral-api/Dockerfile.j2

@@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
 
 COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
-RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
+RUN chmod 644 /usr/local/bin/kolla_mistral_extend_start
 
 {% block mistral_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/monasca/monasca-api/Dockerfile.j2

@@ -27,7 +27,7 @@ COPY extend_start.sh /usr/local/bin/kolla_monasca_extend_start
 
 RUN ln -s monasca-api-source/* monasca-api \
     && {{ macros.install_pip(monasca_api_pip_packages | customizable("pip_packages")) }} \
-    && chmod 755 /usr/local/bin/kolla_monasca_extend_start
+    && chmod 644 /usr/local/bin/kolla_monasca_extend_start
 
 {% block monasca_api_footer %}{% endblock %}
 

docker/murano/murano-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_murano_extend_start
-RUN chmod 755 /usr/local/bin/kolla_murano_extend_start
+RUN chmod 644 /usr/local/bin/kolla_murano_extend_start
 
 {% block murano_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/neutron/neutron-server/Dockerfile.j2

@@ -23,7 +23,7 @@ RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packag
     && if [ "$(ls /plugins)" ]; then \
            {{ macros.install_pip(neutron_server_plugins_pip_packages) }}; \
        fi \
-    && chmod 755 /usr/local/bin/kolla_neutron_extend_start
+    && chmod 644 /usr/local/bin/kolla_neutron_extend_start
 
 {% block neutron_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/nova/nova-api/Dockerfile.j2

@@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(nova_api_packages | customizable("packages")) }}
 
 COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
-RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
+RUN chmod 644 /usr/local/bin/kolla_nova_extend_start
 
 {% block nova_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/nova/nova-compute/Dockerfile.j2

@@ -103,7 +103,7 @@ RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages
     && if [ "$(ls /plugins)" ]; then \
            {{ macros.install_pip(nova_compute_plugins_pip_packages) }}; \
        fi \
-    && chmod 755 /usr/local/bin/kolla_nova_extend_start \
+    && chmod 644 /usr/local/bin/kolla_nova_extend_start \
     && rm -f /etc/machine-id
 
 {% block nova_compute_footer %}{% endblock %}

docker/nova/nova-conductor/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
-RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
+RUN chmod 644 /usr/local/bin/kolla_nova_extend_start
 
 {% block nova_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/octavia/octavia-api/Dockerfile.j2

@@ -21,7 +21,7 @@ COPY extend_start.sh /usr/local/bin/kolla_octavia_extend_start
 RUN if [ "$(ls /plugins)" ]; then \
         {{ macros.install_pip(octavia_api_plugins_pip_packages) }} ; \
     fi \
-    && chmod 755 /usr/local/bin/kolla_octavia_extend_start
+    && chmod 644 /usr/local/bin/kolla_octavia_extend_start
 
 {{ macros.install_packages(octavia_api_packages | customizable("packages")) }}
 

docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2

@@ -25,7 +25,7 @@ RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }}
 {% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
-RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
+RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_netcontrold_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2

@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% block openvswitch_vswitchd_header %}{% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
-RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
+RUN chmod 644 /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_vswitchd_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2

@@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 COPY extend_start.sh /usr/local/bin/kolla_ovsdpdk_extend_start
 COPY start_ovsdb_server.sh /usr/local/bin/start-ovsdb-server
-RUN chmod 755 /usr/local/bin/kolla_ovsdpdk_extend_start && \
+RUN chmod 644 /usr/local/bin/kolla_ovsdpdk_extend_start && \
     chmod 755 /usr/local/bin/start-ovsdb-server
 
 {% block ovsdpdk_db_footer %}{% endblock %}

docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2

@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% block ovsdpdk_vswitchd_header %}{% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_ovsdpdk_extend_start
-RUN chmod 755 /usr/local/bin/kolla_ovsdpdk_extend_start
+RUN chmod 644 /usr/local/bin/kolla_ovsdpdk_extend_start
 
 {% block ovsdpdk_vswitchd_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/sahara/sahara-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_sahara_extend_start
-RUN chmod 755 /usr/local/bin/kolla_sahara_extend_start
+RUN chmod 644 /usr/local/bin/kolla_sahara_extend_start
 
 {% block sahara_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/senlin/senlin-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_senlin_extend_start
-RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start
+RUN chmod 644 /usr/local/bin/kolla_senlin_extend_start
 
 {% block senlin_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/solum/solum-api/Dockerfile.j2

@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% block solum_api_header %}{% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_solum_extend_start
-RUN chmod 755 /usr/local/bin/kolla_solum_extend_start
+RUN chmod 644 /usr/local/bin/kolla_solum_extend_start
 
 {% block solum_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/tacker/tacker-server/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_tacker_extend_start
-RUN chmod 755 /usr/local/bin/kolla_tacker_extend_start
+RUN chmod 644 /usr/local/bin/kolla_tacker_extend_start
 
 {% block tacker_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/trove/trove-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_trove_extend_start
-RUN chmod 755 /usr/local/bin/kolla_trove_extend_start
+RUN chmod 644 /usr/local/bin/kolla_trove_extend_start
 
 {% block trove_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/venus/venus-manager/Dockerfile.j2

@@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block venus_manager_header %}{% endblock %}
 
-RUN chmod 755 /usr/local/bin/kolla_venus_extend_start
+RUN chmod 644 /usr/local/bin/kolla_venus_extend_start
 
 {% block venus_manager_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/vitrage/vitrage-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_vitrage_extend_start
-RUN chmod 755 /usr/local/bin/kolla_vitrage_extend_start
+RUN chmod 644 /usr/local/bin/kolla_vitrage_extend_start
 
 {% block vitrage_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/watcher/watcher-api/Dockerfile.j2

@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start
-RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start
+RUN chmod 644 /usr/local/bin/kolla_watcher_extend_start
 
 {% block watcher_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/zun/zun-api/Dockerfile.j2

@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% block zun_api_header %}{% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start
-RUN chmod 755 /usr/local/bin/kolla_zun_extend_start
+RUN chmod 644 /usr/local/bin/kolla_zun_extend_start
 
 {% block zun_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/zun/zun-compute/Dockerfile.j2

@@ -21,7 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start
 
-RUN chmod 755 /usr/local/bin/kolla_zun_extend_start \
+RUN chmod 644 /usr/local/bin/kolla_zun_extend_start \
     && chmod 750 /etc/sudoers.d \
     && chmod 640 /etc/sudoers.d/kolla_zun_sudoers