openstack/kolla
Code Issues Proposed changes

Adjust permissions on _extend_start files.

Browse Source 
Explicitly set the permissions on the kolla-toolbox kolla_extend_start
file. Also, since all extend_start files are sourced rather than
executed, the executable bits are now cleared throughout the project.

Change-Id: I5c2deb4a2e33575d57c852089f856a9acc6818d0
This commit is contained in:
Tim Shearer 2022-04-01 16:22:28 -04:00 committed by Radosław Piliszek
parent 19765c6297
commit 1d96a2bbe1
71 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/aodh/aodh-base/Dockerfile.j2
View File

@ -34,6 +34,6 @@ RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \
&& chmod 755 /var/www/cgi-bin/aodh \
&& touch /usr/local/bin/kolla_aodh_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start
{% block aodh_base_footer %}{% endblock %}

2
docker/barbican/barbican-base/Dockerfile.j2
View File

@ -37,6 +37,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_barbican_sudoers \
&& touch /usr/local/bin/kolla_barbican_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_barbican_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_barbican_extend_start
{% block barbican_base_footer %}{% endblock %}

3
docker/base/Dockerfile.j2
View File

@ -384,7 +384,8 @@ RUN chmod 755 /usr/local/bin/healthcheck_*
{% endif %}
RUN touch /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs /usr/local/bin/kolla_copy_cacerts /usr/local/bin/kolla_httpd_setup \
&& chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_set_configs /usr/local/bin/kolla_copy_cacerts \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_httpd_setup \
&& chmod 440 /etc/sudoers \
&& mkdir -p /var/log/kolla \
&& chown :kolla /var/log/kolla \

2
docker/blazar/blazar-base/Dockerfile.j2
View File

@ -24,6 +24,6 @@ RUN ln -s blazar-base-source/* blazar \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_blazar_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_blazar_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_blazar_extend_start
{% block blazar_base_footer %}{% endblock %}

2
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -37,6 +37,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_ceilometer_sudoers \
&& touch /usr/local/bin/kolla_ceilometer_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ceilometer_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ceilometer_extend_start
{% block ceilometer_base_footer %}{% endblock %}

2
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -49,6 +49,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_cinder_sudoers \
&& touch /usr/local/bin/kolla_cinder_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start
{% block cinder_base_footer %}{% endblock %}

2
docker/cloudkitty/cloudkitty-base/Dockerfile.j2
View File

@ -23,6 +23,6 @@ RUN ln -s cloudkitty-base-source/* cloudkitty \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_cloudkitty_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cloudkitty_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cloudkitty_extend_start
{% block cloudkitty_base_footer %}{% endblock %}

2
docker/collectd/Dockerfile.j2
View File

@ -72,7 +72,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(collectd_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& chown -R collectd /var/lib/collectd \
&& chown -R collectd /etc/collectd* \
&& chown -R collectd /var/run/

2
docker/cron/Dockerfile.j2
View File

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

2
docker/cyborg/cyborg-base/Dockerfile.j2
View File

@ -25,6 +25,6 @@ COPY cyborg_sudoers /etc/sudoers.d/kolla_cyborg_sudoers
RUN chmod 750 /etc/sudoers.d \
&& touch /usr/local/bin/kolla_cyborg_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cyborg_extend_start
{% block cyborg_footer %}{% endblock %}

2
docker/designate/designate-base/Dockerfile.j2
View File

@ -28,6 +28,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_designate_sudoers \
&& touch /usr/local/bin/kolla_designate_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_designate_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_designate_extend_start
{% block designate_base_footer %}{% endblock %}

2
docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
View File

@ -36,7 +36,7 @@ RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }}
&& chown -R elasticsearch: /etc/elasticsearch-curator
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block elasticsearch_curator_base_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/elasticsearch/elasticsearch/Dockerfile.j2
View File

@ -46,7 +46,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
#
# https://discuss.elastic.co/t/running-as-non-root-user-service-wrapper-has-changed/7863
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block elasticsearch_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/etcd/Dockerfile.j2
View File

@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
COPY etcd_sudoers /etc/sudoers.d/kolla_etcd_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_etcd_sudoers

2
docker/fluentd/Dockerfile.j2
View File

@ -46,7 +46,7 @@ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \
&& chown -R {{ fluentd_user }}: /etc/{{ fluentd_user }} /var/run/{{ fluentd_user }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block fluentd_plugins_install %}

2
docker/freezer/freezer-base/Dockerfile.j2
View File

@ -34,6 +34,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_freezer_sudoers \
&& touch /usr/local/bin/kolla_freezer_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_freezer_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_freezer_extend_start
{% block freezer_base_footer %}{% endblock %}

2
docker/glance/glance-base/Dockerfile.j2
View File

@ -48,6 +48,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_glance_sudoers \
&& touch /usr/local/bin/kolla_glance_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start
{% block glance_base_footer %}{% endblock %}

2
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -49,6 +49,6 @@ COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \
&& touch /usr/local/bin/kolla_gnocchi_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start
{% block gnocchi_base_footer %}{% endblock %}

2
docker/grafana/Dockerfile.j2
View File

@ -36,7 +36,7 @@ RUN grafana-cli plugins install gnocchixyz-gnocchi-datasource \
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start
{% block grafana_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/hacluster/hacluster-base/Dockerfile.j2
View File

@ -11,6 +11,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block hacluster_base_footer %}{% endblock %}

2
docker/heat/heat-base/Dockerfile.j2
View File

@ -30,6 +30,6 @@ RUN ln -s heat-base-source/* heat \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_heat_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
{% block heat_base_footer %}{% endblock %}

2
docker/horizon/Dockerfile.j2
View File

@ -61,7 +61,7 @@ RUN ln -s horizon-source/* horizon \
&& chown -R horizon: /etc/openstack-dashboard
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block horizon_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/influxdb/Dockerfile.j2
View File

@ -19,7 +19,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_influxdb_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start
{% block influxdb_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/ironic-inspector/Dockerfile.j2
View File

@ -36,7 +36,7 @@ RUN chmod 750 /etc/sudoers.d \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& mkdir -p /var/lib/ironic-inspector/dhcp-hostsdir \
&& chown -R ironic-inspector: /etc/ironic-inspector /var/lib/ironic-inspector

2
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -29,7 +29,7 @@ RUN chmod 750 /etc/sudoers.d \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_ironic_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ironic_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ironic_extend_start \
&& chown -R ironic: /etc/ironic
{% block ironic_base_footer %}{% endblock %}

2
docker/iscsid/Dockerfile.j2
View File

@ -26,7 +26,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(iscsid_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& rm /etc/iscsi/initiatorname.iscsi
{% block iscsid_footer %}{% endblock %}

2
docker/kafka/Dockerfile.j2
View File

@ -43,7 +43,7 @@ RUN curl -o /tmp/kafka.tgz ${kafka_url} \
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block kafka_footer %}{% endblock %}
{% block footer %}{% endblock %}

3
docker/keepalived/Dockerfile.j2
View File

@ -22,7 +22,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
COPY check_alive.sh /
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& chmod 755 /check_alive.sh
{% block keepalived_footer %}{% endblock %}
{% block footer %}{% endblock %}

3
docker/keystone/keystone-fernet/Dockerfile.j2
View File

@ -25,7 +25,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
COPY fetch_fernet_tokens.py /usr/bin/
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap /usr/bin/fetch_fernet_tokens.py
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_keystone_bootstrap /usr/bin/fetch_fernet_tokens.py
{% block keystone_fernet_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/keystone/keystone-ssh/Dockerfile.j2
View File

@ -34,7 +34,7 @@ RUN mkdir -p /var/run/sshd \
RUN sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block keystone_ssh_footer %}{% endblock %}
{% block footer %}{% endblock %}

3
docker/keystone/keystone/Dockerfile.j2
View File

@ -9,7 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_keystone_bootstrap
{% if base_package_type == 'rpm' %}
{% set keystone_packages = [

2
docker/kibana/Dockerfile.j2
View File

@ -29,7 +29,7 @@ RUN dpkg --add-architecture amd64 && \
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block kibana_footer %}{% endblock %}
{% block footer %}{% endblock %}

1
docker/kolla-toolbox/Dockerfile.j2
View File

@ -102,6 +102,7 @@ COPY ansible_sudoers /etc/sudoers.d/kolla_ansible_sudoers
RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block kolla_toolbox_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/kuryr/kuryr-base/Dockerfile.j2
View File

@ -24,6 +24,6 @@ RUN ln -s kuryr-base-source/* kuryr-base \
&& chown -R kuryr: /etc/kuryr
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block kuryr_base_footer %}{% endblock %}

2
docker/letsencrypt/Dockerfile.j2
View File

@ -23,7 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block letsencrypt_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/logstash/Dockerfile.j2
View File

@ -37,7 +37,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-{{debian_arch}}/
{{ macros.install_packages(logstash_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block logstash_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/magnum/magnum-base/Dockerfile.j2
View File

@ -25,6 +25,6 @@ RUN ln -s magnum-base-source/* magnum \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_magnum_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_magnum_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_magnum_extend_start
{% block magnum_base_footer %}{% endblock %}

2
docker/manila/manila-base/Dockerfile.j2
View File

@ -41,6 +41,6 @@ COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_manila_sudoers \
&& touch /usr/local/bin/kolla_manila_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_manila_extend_start
{% block manila_base_footer %}{% endblock %}

2
docker/mariadb/mariadb-server/Dockerfile.j2
View File

@ -39,7 +39,7 @@ RUN ln -s /usr/lib64/galera-4 /usr/lib64/galera
COPY mariadb_sudoers /etc/sudoers.d/kolla_mariadb_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY security_reset.expect /usr/local/bin/kolla_security_reset
RUN chmod 755 /usr/local/bin/kolla_extend_start \
RUN chmod 644 /usr/local/bin/kolla_extend_start \
&& chmod 755 /usr/local/bin/kolla_security_reset \
&& chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \

2
docker/masakari/masakari-base/Dockerfile.j2
View File

@ -41,6 +41,6 @@ RUN ln -s masakari-base-source/* masakari \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_masakari_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_masakari_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_masakari_extend_start
{% block masakari_base_footer %}{% endblock %}

2
docker/mistral/mistral-base/Dockerfile.j2
View File

@ -33,6 +33,6 @@ RUN ln -s mistral-base-source/* mistral \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_mistral_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_mistral_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_mistral_extend_start
{% block mistral_base_footer %}{% endblock %}

2
docker/monasca/monasca-base/Dockerfile.j2
View File

@ -34,6 +34,6 @@ RUN {{ macros.install_pip(monasca_base_pip_packages | customizable("pip_packages
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_monasca_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_monasca_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_monasca_extend_start
{% block monasca_base_footer %}{% endblock %}

2
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -61,7 +61,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY topology_bootstrap.sh /usr/local/bin/topology_bootstrap
RUN touch /usr/local/bin/kolla_monasca_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start \
/usr/local/bin/kolla_monasca_extend_start \
/usr/local/bin/topology_bootstrap

2
docker/murano/murano-base/Dockerfile.j2
View File

@ -28,6 +28,6 @@ RUN ln -s murano-base-source/* murano \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_murano_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_murano_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_murano_extend_start
{% block murano_base_footer %}{% endblock %}

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -87,6 +87,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_neutron_sudoers \
&& touch /usr/local/bin/kolla_neutron_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_neutron_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_neutron_extend_start
{% block neutron_base_footer %}{% endblock %}

2
docker/nova/nova-base/Dockerfile.j2
View File

@ -80,6 +80,6 @@ RUN chmod 750 /etc/sudoers.d \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_nova_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start
{% block nova_base_footer %}{% endblock %}

2
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -96,7 +96,7 @@ RUN rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/auto
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block nova_libvirt_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/nova/nova-ssh/Dockerfile.j2
View File

@ -31,7 +31,7 @@ RUN mkdir -p /var/run/sshd \
RUN sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block nova_ssh_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/octavia/octavia-base/Dockerfile.j2
View File

@ -31,6 +31,6 @@ RUN ln -s /octavia-base-source/* octavia \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_octavia_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_octavia_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_octavia_extend_start
{% block octavia_base_footer %}{% endblock %}

2
docker/openvswitch/openvswitch-base/Dockerfile.j2
View File

@ -37,6 +37,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
# NOTE(hrw): Upstream moved tcpdump to /usr/bin/ in 4.99 version (used in Debian)
RUN if [ -e /usr/sbin/tcpdump ]; then mv /usr/sbin/tcpdump /usr/bin/tcpdump; fi \
&& touch /usr/local/bin/kolla_openvswitch_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start
{% block openvswitch_base_footer %}{% endblock %}

2
docker/ovn/ovn-base/Dockerfile.j2
View File

@ -22,6 +22,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block ovn_base_footer %}{% endblock %}

2
docker/ovsdpdk/ovsdpdk/Dockerfile.j2
View File

@ -32,6 +32,6 @@ RUN update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block ovsdpdk_footer %}{% endblock %}

2
docker/placement/placement-base/Dockerfile.j2
View File

@ -39,6 +39,6 @@ RUN ln -s placement-base-source/* placement \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_placement_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_placement_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_placement_extend_start
{% block placement_base_footer %}{% endblock %}

2
docker/prometheus/prometheus-base/Dockerfile.j2
View File

@ -10,6 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='prometheus') }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block prometheus_base_footer %}{% endblock %}

2
docker/proxysql/Dockerfile.j2
View File

@ -29,7 +29,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
COPY kolla_proxysql_start kolla_proxysql_config_sync kolla_extend_start /usr/local/bin/
RUN chmod 755 /usr/local/bin/kolla_proxysql_start \
&& chmod 755 /usr/local/bin/kolla_proxysql_config_sync \
&& chmod 755 /usr/local/bin/kolla_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start
{% block proxysql_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/rabbitmq/Dockerfile.j2
View File

@ -57,7 +57,7 @@ RUN chmod 755 /usr/local/bin/healthcheck_rabbitmq
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block rabbitmq_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/redis/redis-base/Dockerfile.j2
View File

@ -10,6 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='redis', homedir='/run/redis') }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block redis_base_footer %}{% endblock %}

2
docker/sahara/sahara-base/Dockerfile.j2
View File

@ -42,6 +42,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_sahara_sudoers \
&& touch /usr/local/bin/kolla_sahara_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_sahara_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_sahara_extend_start
{% block sahara_base_footer %}{% endblock %}

2
docker/senlin/senlin-base/Dockerfile.j2
View File

@ -24,6 +24,6 @@ RUN ln -s senlin-base-source/* senlin \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_senlin_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_senlin_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_senlin_extend_start
{% block senlin_base_footer %}{% endblock %}

2
docker/skydive/skydive-base/Dockerfile.j2
View File

@ -28,6 +28,6 @@ RUN curl -o /usr/bin/skydive ${skydive_url} \
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block skydive_base_footer %}{% endblock %}

2
docker/solum/solum-base/Dockerfile.j2
View File

@ -24,6 +24,6 @@ RUN ln -s solum-base-source/* solum \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_solum_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_solum_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_solum_extend_start
{% block solum_base_footer %}{% endblock %}

2
docker/storm/storm-base/Dockerfile.j2
View File

@ -53,6 +53,6 @@ ENV PYTHON='/usr/bin/python3'
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block storm_base_footer %}{% endblock %}

2
docker/swift/swift-rsyncd/Dockerfile.j2
View File

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

2
docker/tacker/tacker-base/Dockerfile.j2
View File

@ -33,6 +33,6 @@ RUN ln -s tacker-base-source/* tacker \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_tacker_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_tacker_extend_start
{% block tacker_base_footer %}{% endblock %}

2
docker/telegraf/Dockerfile.j2
View File

@ -34,7 +34,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_telegraf_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start
{% block telegraf_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/trove/trove-base/Dockerfile.j2
View File

@ -24,6 +24,6 @@ RUN ln -s trove-base-source/* trove \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_trove_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start
{% block trove_base_footer %}{% endblock %}

2
docker/venus/venus-base/Dockerfile.j2
View File

@ -24,6 +24,6 @@ RUN ln -s venus-base-source/* venus \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_venus_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_venus_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_venus_extend_start
{% block venus_base_footer %}{% endblock %}

2
docker/vitrage/vitrage-base/Dockerfile.j2
View File

@ -37,6 +37,6 @@ RUN ln -s vitrage-base-source/* vitrage \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_vitrage_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_vitrage_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_vitrage_extend_start
{% block vitrage_base_footer %}{% endblock %}

2
docker/watcher/watcher-base/Dockerfile.j2
View File

@ -25,6 +25,6 @@ RUN ln -s watcher-base-source/* watcher \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_watcher_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start
{% block watcher_base_footer %}{% endblock %}

2
docker/zookeeper/Dockerfile.j2
View File

@ -35,7 +35,7 @@ RUN curl -o /tmp/zookeeper.tar.gz ${zookeeper_url} \
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
{% block zookeeper_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/zun/zun-base/Dockerfile.j2
View File

@ -50,6 +50,6 @@ RUN chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_zun_sudoers \
&& touch /usr/local/bin/kolla_zun_extend_start \
&& chmod 755 /var/www/cgi-bin/zun \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zun_extend_start
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zun_extend_start
{% block zun_base_footer %}{% endblock %}