diff options
Diffstat (limited to 'kolla/docker')
60 files changed, 0 insertions, 480 deletions
diff --git a/kolla/docker/aodh/aodh-base/extend_start.sh b/kolla/docker/aodh/aodh-base/extend_start.sh index f3b1d2d49..c57d04972 100755 --- a/kolla/docker/aodh/aodh-base/extend_start.sh +++ b/kolla/docker/aodh/aodh-base/extend_start.sh @@ -1,15 +1,3 @@ #!/bin/bash -# Create log dir for Aodh logs -AODH_LOG_DIR="/var/log/kolla/aodh" -if [[ ! -d "${AODH_LOG_DIR}" ]]; then - mkdir -p ${AODH_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${AODH_LOG_DIR}) != "aodh:kolla" ]]; then - chown aodh:kolla ${AODH_LOG_DIR} -fi -if [[ $(stat -c %a ${AODH_LOG_DIR}) != "755" ]]; then - chmod 755 ${AODH_LOG_DIR} -fi - . /usr/local/bin/kolla_aodh_extend_start diff --git a/kolla/docker/barbican/barbican-base/extend_start.sh b/kolla/docker/barbican/barbican-base/extend_start.sh index 16b41ad09..4baacc89d 100755 --- a/kolla/docker/barbican/barbican-base/extend_start.sh +++ b/kolla/docker/barbican/barbican-base/extend_start.sh @@ -1,15 +1,3 @@ #!/bin/bash -# Create log dir for Barbican logs -LOG_DIR="/var/log/kolla/barbican" -if [[ ! -d "${LOG_DIR}" ]]; then - mkdir -p ${LOG_DIR} -fi -if [[ $(stat -c %U:%G ${LOG_DIR}) != "barbican:kolla" ]]; then - chown barbican:kolla ${LOG_DIR} -fi -if [[ $(stat -c %a ${LOG_DIR}) != "755" ]]; then - chmod 755 ${LOG_DIR} -fi - . /usr/local/bin/kolla_barbican_extend_start diff --git a/kolla/docker/blazar/blazar-base/extend_start.sh b/kolla/docker/blazar/blazar-base/extend_start.sh index a96a4c113..e465dabd2 100644 --- a/kolla/docker/blazar/blazar-base/extend_start.sh +++ b/kolla/docker/blazar/blazar-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/blazar" ]]; then - mkdir -p /var/log/kolla/blazar -fi -if [[ $(stat -c %a /var/log/kolla/blazar) != "755" ]]; then - chmod 755 /var/log/kolla/blazar -fi - . /usr/local/bin/kolla_blazar_extend_start diff --git a/kolla/docker/ceilometer/ceilometer-base/extend_start.sh b/kolla/docker/ceilometer/ceilometer-base/extend_start.sh index 4d3fe6b61..a795f0bc9 100644 --- a/kolla/docker/ceilometer/ceilometer-base/extend_start.sh +++ b/kolla/docker/ceilometer/ceilometer-base/extend_start.sh @@ -1,15 +1,3 @@ #!/bin/bash -CEILOMETER_LOG_DIR=/var/log/kolla/ceilometer - -if [[ ! -d "${CEILOMETER_LOG_DIR}" ]]; then - mkdir -p "${CEILOMETER_LOG_DIR}" -fi -if [[ $(stat -c %U:%G "${CEILOMETER_LOG_DIR}") != "ceilometer:kolla" ]]; then - chown ceilometer:kolla "${CEILOMETER_LOG_DIR}" -fi -if [[ $(stat -c %a "${CEILOMETER_LOG_DIR}") != "755" ]]; then - chmod 755 "${CEILOMETER_LOG_DIR}" -fi - . /usr/local/bin/kolla_ceilometer_extend_start diff --git a/kolla/docker/cinder/cinder-base/extend_start.sh b/kolla/docker/cinder/cinder-base/extend_start.sh index ddf1469c9..eaa2d77d7 100644 --- a/kolla/docker/cinder/cinder-base/extend_start.sh +++ b/kolla/docker/cinder/cinder-base/extend_start.sh @@ -1,13 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/cinder" ]]; then - mkdir -p /var/log/kolla/cinder -fi -if [[ $(stat -c %U:%G /var/log/kolla/cinder) != "cinder:kolla" ]]; then - chown -R cinder:kolla /var/log/kolla/cinder -fi -if [[ $(stat -c %a /var/log/kolla/cinder) != "755" ]]; then - chmod 755 /var/log/kolla/cinder -fi - . /usr/local/bin/kolla_cinder_extend_start diff --git a/kolla/docker/cloudkitty/cloudkitty-base/extend_start.sh b/kolla/docker/cloudkitty/cloudkitty-base/extend_start.sh index cf49f9caf..896092b94 100644 --- a/kolla/docker/cloudkitty/cloudkitty-base/extend_start.sh +++ b/kolla/docker/cloudkitty/cloudkitty-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/cloudkitty" ]]; then - mkdir -p /var/log/kolla/cloudkitty -fi -if [[ $(stat -c %a /var/log/kolla/cloudkitty) != "755" ]]; then - chmod 755 /var/log/kolla/cloudkitty -fi - . /usr/local/bin/kolla_cloudkitty_extend_start diff --git a/kolla/docker/collectd/extend_start.sh b/kolla/docker/collectd/extend_start.sh index 80ef63db3..05a7907cf 100644 --- a/kolla/docker/collectd/extend_start.sh +++ b/kolla/docker/collectd/extend_start.sh @@ -1,8 +1,2 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/collectd" ]]; then - mkdir -p /var/log/kolla/collectd -fi -if [[ $(stat -c %a /var/log/kolla/collectd) != "755" ]]; then - chmod 755 /var/log/kolla/collectd -fi diff --git a/kolla/docker/cyborg/cyborg-base/extend_start.sh b/kolla/docker/cyborg/cyborg-base/extend_start.sh index 10a58c626..ac3237a4e 100755 --- a/kolla/docker/cyborg/cyborg-base/extend_start.sh +++ b/kolla/docker/cyborg/cyborg-base/extend_start.sh @@ -1,15 +1,3 @@ #!/bin/bash -# Create log dir for Cyborg logs -CYBORG_LOG_DIR="/var/log/kolla/cyborg" -if [[ ! -d "${CYBORG_LOG_DIR}" ]]; then - mkdir -p ${CYBORG_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${CYBORG_LOG_DIR}) != "cyborg:kolla" ]]; then - chown cyborg:kolla ${CYBORG_LOG_DIR} -fi -if [[ $(stat -c %a ${CYBORG_LOG_DIR}) != "755" ]]; then - chmod 755 ${CYBORG_LOG_DIR} -fi - . /usr/local/bin/kolla_cyborg_extend_start diff --git a/kolla/docker/designate/designate-base/extend_start.sh b/kolla/docker/designate/designate-base/extend_start.sh index 66b376c30..d138e189c 100644 --- a/kolla/docker/designate/designate-base/extend_start.sh +++ b/kolla/docker/designate/designate-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/designate" ]]; then - mkdir -p /var/log/kolla/designate -fi -if [[ $(stat -c %a /var/log/kolla/designate) != "755" ]]; then - chmod 755 /var/log/kolla/designate -fi - . /usr/local/bin/kolla_designate_extend_start diff --git a/kolla/docker/designate/designate-central/extend_start.sh b/kolla/docker/designate/designate-central/extend_start.sh index 8e90f55fc..d9c990626 100644 --- a/kolla/docker/designate/designate-central/extend_start.sh +++ b/kolla/docker/designate/designate-central/extend_start.sh @@ -1,10 +1,5 @@ #!/bin/bash -if [[ ! -f "/var/log/kolla/designate/designate-manage.log" ]]; then - touch /var/log/kolla/designate/designate-manage.log - chmod 644 /var/log/kolla/designate/designate-manage.log -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 diff --git a/kolla/docker/dnsmasq/extend_start.sh b/kolla/docker/dnsmasq/extend_start.sh index 0c9734fa1..5701bbc8b 100644 --- a/kolla/docker/dnsmasq/extend_start.sh +++ b/kolla/docker/dnsmasq/extend_start.sh @@ -3,17 +3,6 @@ DNSMASQ_PIDFILE=${DNSMASQ_PIDFILE:-/run/ironic/dnsmasq.pid} DNSMASQ_PIDFILE_DIR="$(dirname $DNSMASQ_PIDFILE)" -if [[ ! -d "/var/log/kolla/ironic" ]]; then - mkdir -p /var/log/kolla/ironic -fi -if [[ $(stat -c %a /var/log/kolla/ironic) != "755" ]]; then - chmod 755 /var/log/kolla/ironic -fi -if [[ ! -r "/var/log/kolla/ironic/dnsmasq.log" ]]; then - touch /var/log/kolla/ironic/dnsmasq.log - chown ironic:ironic /var/log/kolla/ironic/dnsmasq.log -fi - if [[ ! -d "$DNSMASQ_PIDFILE_DIR" ]]; then mkdir -p "$DNSMASQ_PIDFILE_DIR" fi diff --git a/kolla/docker/etcd/extend_start.sh b/kolla/docker/etcd/extend_start.sh index c54023299..0bbb19b01 100644 --- a/kolla/docker/etcd/extend_start.sh +++ b/kolla/docker/etcd/extend_start.sh @@ -1,13 +1,5 @@ #!/bin/bash -# Create log directory, with appropriate permissions -if [[ ! -d "/var/log/kolla/etcd" ]]; then - mkdir -p /var/log/kolla/etcd -fi -if [[ $(stat -c %a /var/log/kolla/etcd) != "755" ]]; then - chmod 755 /var/log/kolla/etcd -fi - if [[ $(stat -c %U /var/lib/etcd/) != "etcd" ]]; then sudo chown etcd: /var/lib/etcd/ fi diff --git a/kolla/docker/fluentd/extend_start.sh b/kolla/docker/fluentd/extend_start.sh index 6b304b92c..1e99677a0 100644 --- a/kolla/docker/fluentd/extend_start.sh +++ b/kolla/docker/fluentd/extend_start.sh @@ -1,20 +1,5 @@ #!/bin/bash -# Give processes executed with the "kolla" group the permission to create files -# and sub-directories in the /var/log/kolla directory. -# -# Also set the setgid permission on the /var/log/kolla directory so that new -# files and sub-directories in that directory inherit its group id ("kolla"). - -if [ ! -d /var/log/kolla ]; then - mkdir -p /var/log/kolla -fi -if [[ $(stat -c %U:%G /var/log/kolla) != "fluentd:kolla" ]]; then - sudo chown fluentd:kolla /var/log/kolla -fi -if [[ $(stat -c %a /var/log/kolla) != "2775" ]]; then - sudo chmod 2775 /var/log/kolla -fi if [[ (-d /var/lib/fluentd) && ($(stat -c %U:%G /var/lib/fluentd) != "fluentd:kolla") ]]; then sudo chown fluentd:kolla /var/lib/fluentd fi diff --git a/kolla/docker/glance/glance-base/extend_start.sh b/kolla/docker/glance/glance-base/extend_start.sh index 4f5f5ecaf..26c403921 100644 --- a/kolla/docker/glance/glance-base/extend_start.sh +++ b/kolla/docker/glance/glance-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/glance" ]]; then - mkdir -p /var/log/kolla/glance -fi -if [[ $(stat -c %a /var/log/kolla/glance) != "755" ]]; then - chmod 755 /var/log/kolla/glance -fi - . /usr/local/bin/kolla_glance_extend_start diff --git a/kolla/docker/gnocchi/gnocchi-base/extend_start.sh b/kolla/docker/gnocchi/gnocchi-base/extend_start.sh index adc05b1b3..c35547c8e 100644 --- a/kolla/docker/gnocchi/gnocchi-base/extend_start.sh +++ b/kolla/docker/gnocchi/gnocchi-base/extend_start.sh @@ -1,15 +1,3 @@ #!/bin/bash -# Create log dir for Gnocchi logs -GNOCCHI_LOG_DIR="/var/log/kolla/gnocchi" -if [[ ! -d "${GNOCCHI_LOG_DIR}" ]]; then - mkdir -p ${GNOCCHI_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${GNOCCHI_LOG_DIR}) != "gnocchi:kolla" ]]; then - chown gnocchi:kolla ${GNOCCHI_LOG_DIR} -fi -if [[ $(stat -c %a ${GNOCCHI_LOG_DIR}) != "755" ]]; then - chmod 755 ${GNOCCHI_LOG_DIR} -fi - . /usr/local/bin/kolla_gnocchi_extend_start diff --git a/kolla/docker/grafana/extend_start.sh b/kolla/docker/grafana/extend_start.sh index 5ed4dc56d..05a7907cf 100644 --- a/kolla/docker/grafana/extend_start.sh +++ b/kolla/docker/grafana/extend_start.sh @@ -1,8 +1,2 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/grafana" ]]; then - mkdir -p /var/log/kolla/grafana -fi -if [[ $(stat -c %a /var/log/kolla/grafana) != "755" ]]; then - chmod 755 /var/log/kolla/grafana -fi diff --git a/kolla/docker/hacluster/hacluster-base/extend_start.sh b/kolla/docker/hacluster/hacluster-base/extend_start.sh index c0e9301d0..05a7907cf 100644 --- a/kolla/docker/hacluster/hacluster-base/extend_start.sh +++ b/kolla/docker/hacluster/hacluster-base/extend_start.sh @@ -1,8 +1,2 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/hacluster" ]]; then - mkdir -p /var/log/kolla/hacluster -fi -if [[ $(stat -c %a /var/log/kolla/hacluster) != "755" ]]; then - chmod 755 /var/log/kolla/hacluster -fi diff --git a/kolla/docker/heat/heat-base/extend_start.sh b/kolla/docker/heat/heat-base/extend_start.sh index 1c1e86b8e..ee5021216 100644 --- a/kolla/docker/heat/heat-base/extend_start.sh +++ b/kolla/docker/heat/heat-base/extend_start.sh @@ -1,13 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/heat" ]]; then - mkdir -p /var/log/kolla/heat -fi -if [[ $(stat -c %U:%G /var/log/kolla/heat) != "heat:kolla" ]]; then - chown -R heat:kolla /var/log/kolla/heat -fi -if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then - chmod 755 /var/log/kolla/heat -fi - . /usr/local/bin/kolla_heat_extend_start diff --git a/kolla/docker/horizon/extend_start.sh b/kolla/docker/horizon/extend_start.sh index d1198adb4..8937d3742 100644 --- a/kolla/docker/horizon/extend_start.sh +++ b/kolla/docker/horizon/extend_start.sh @@ -229,20 +229,6 @@ if settings_changed; then settings_bundle | md5sum > $HASH_PATH fi -# NOTE(sbezverk) since Horizon is now storing logs in its own location, /var/log/horizon -# needs to be created if it does not exist -if [[ ! -d "/var/log/kolla/horizon" ]]; then - mkdir -p /var/log/kolla/horizon -fi - -if [[ $(stat -c %U:%G /var/log/kolla/horizon) != "horizon:kolla" ]]; then - chown -R horizon:kolla /var/log/kolla/horizon -fi - -if [[ $(stat -c %a /var/log/kolla/horizon) != "755" ]]; then - chmod 755 /var/log/kolla/horizon -fi - if [[ -f ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store ]] && [[ $(stat -c %U ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store) != "horizon" ]]; then chown horizon ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store fi diff --git a/kolla/docker/ironic/ironic-base/extend_start.sh b/kolla/docker/ironic/ironic-base/extend_start.sh index dc6b05caa..cd1dcb0b2 100644 --- a/kolla/docker/ironic/ironic-base/extend_start.sh +++ b/kolla/docker/ironic/ironic-base/extend_start.sh @@ -1,17 +1,10 @@ #!/bin/bash -LOG_PATH=/var/log/kolla/ironic METRICS_PATH=/var/lib/ironic-metrics -if [[ ! -d "${LOG_PATH}" ]]; then - mkdir -p "${LOG_PATH}" -fi if [[ ! -d "${METRICS_PATH}" ]]; then sudo mkdir -p "${METRICS_PATH}" fi -if [[ $(stat -c %a "${LOG_PATH}") != "755" ]]; then - chmod 755 "${LOG_PATH}" -fi if [[ $(stat -c %U:%G "${METRICS_PATH}") != "ironic:ironic" ]]; then sudo chown ironic:ironic "${METRICS_PATH}" fi diff --git a/kolla/docker/keystone/keystone/extend_start.sh b/kolla/docker/keystone/keystone/extend_start.sh index b45c94d0d..0011c72fd 100644 --- a/kolla/docker/keystone/keystone/extend_start.sh +++ b/kolla/docker/keystone/keystone/extend_start.sh @@ -1,23 +1,5 @@ #!/bin/bash -# Create log dir for Keystone logs -KEYSTONE_LOG_DIR="/var/log/kolla/keystone" -if [[ ! -d "${KEYSTONE_LOG_DIR}" ]]; then - mkdir -p ${KEYSTONE_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${KEYSTONE_LOG_DIR}) != "keystone:kolla" ]]; then - chown keystone:kolla ${KEYSTONE_LOG_DIR} -fi -if [ ! -f "${KEYSTONE_LOG_DIR}/keystone.log" ]; then - touch ${KEYSTONE_LOG_DIR}/keystone.log -fi -if [[ $(stat -c %U:%G ${KEYSTONE_LOG_DIR}/keystone.log) != "keystone:keystone" ]]; then - chown keystone:keystone ${KEYSTONE_LOG_DIR}/keystone.log -fi -if [[ $(stat -c %a ${KEYSTONE_LOG_DIR}) != "755" ]]; then - chmod 755 ${KEYSTONE_LOG_DIR} -fi - EXTRA_KEYSTONE_MANAGE_ARGS=${EXTRA_KEYSTONE_MANAGE_ARGS-} # Upgrade and exit if KOLLA_UPGRADE variable is set. This catches all cases # of the KOLLA_UPGRADE variable being set, including empty. diff --git a/kolla/docker/kolla-toolbox/extend_start.sh b/kolla/docker/kolla-toolbox/extend_start.sh index 198587145..05a7907cf 100644 --- a/kolla/docker/kolla-toolbox/extend_start.sh +++ b/kolla/docker/kolla-toolbox/extend_start.sh @@ -1,13 +1,2 @@ #!/bin/bash -if [[ ! -f "/var/log/kolla/ansible.log" ]]; then - touch /var/log/kolla/ansible.log -fi - -if [[ $(stat -c %U:%G /var/log/kolla/ansible.log) != "ansible:kolla" ]]; then - chown -R ansible:kolla /var/log/kolla/ansible.log -fi - -if [[ $(stat -c %a /var/log/kolla/ansible.log) != "664" ]]; then - chmod 664 /var/log/kolla/ansible.log -fi diff --git a/kolla/docker/letsencrypt/letsencrypt-base/extend_start.sh b/kolla/docker/letsencrypt/letsencrypt-base/extend_start.sh index 0300f0b44..3a0481bcd 100644 --- a/kolla/docker/letsencrypt/letsencrypt-base/extend_start.sh +++ b/kolla/docker/letsencrypt/letsencrypt-base/extend_start.sh @@ -1,14 +1,5 @@ #!/bin/bash -# Logs - -if [[ ! -d "/var/log/kolla/letsencrypt" ]]; then - mkdir -p /var/log/kolla/letsencrypt -fi -if [[ $(stat -c %a /var/log/kolla/letsencrypt) != "755" ]]; then - chmod 755 /var/log/kolla/letsencrypt -fi - # Structure for lego and webserver FOLDERS_LEGO="/etc/letsencrypt /etc/letsencrypt/lego /etc/letsencrypt/lego/internal /etc/letsencrypt/lego/external" diff --git a/kolla/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh b/kolla/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh index 4c06688e1..9ff4731e8 100755 --- a/kolla/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh +++ b/kolla/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh @@ -133,7 +133,6 @@ DNS_ADDITIONAL_OPTS="" DNS_ENV_FILE="" LOG_FILE="/var/log/kolla/letsencrypt/lesencrypt-lego.log" - VALID_ARGS=$(getopt -o ief:p:d:m:a:v:h:k: --long internal,external,fqdns:,port:,days:,mail:,acme:,vips:,haproxies-ssh:,eab,kid:,hmac:,key-type:,challenge:,dns-provider:,dns-additional-opts:,env-file: -- "$@") if [[ $? -ne 0 ]]; then exit 1; diff --git a/kolla/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh b/kolla/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh index e1e421c46..61c45f222 100644 --- a/kolla/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh +++ b/kolla/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh @@ -17,8 +17,6 @@ function log_error { INTERNAL_SET="false" EXTERNAL_SET="false" -LOG_FILE="/var/log/kolla/letsencrypt/lesencrypt-lego.log" - VALID_ARGS=$(getopt -o ief:l: --long internal,external,fqdn:,haproxies-ssh: -- "$@") if [[ $? -ne 0 ]]; then diff --git a/kolla/docker/magnum/magnum-base/extend_start.sh b/kolla/docker/magnum/magnum-base/extend_start.sh index 2e58c9776..0e4c2d2bc 100644 --- a/kolla/docker/magnum/magnum-base/extend_start.sh +++ b/kolla/docker/magnum/magnum-base/extend_start.sh @@ -1,10 +1,3 @@ #!/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 - . /usr/local/bin/kolla_magnum_extend_start diff --git a/kolla/docker/manila/manila-base/extend_start.sh b/kolla/docker/manila/manila-base/extend_start.sh index c018416a3..563cd6147 100644 --- a/kolla/docker/manila/manila-base/extend_start.sh +++ b/kolla/docker/manila/manila-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/manila" ]]; then - mkdir -p /var/log/kolla/manila -fi -if [[ $(stat -c %a /var/log/kolla/manila) != "755" ]]; then - chmod 755 /var/log/kolla/manila -fi - . /usr/local/bin/kolla_manila_extend_start diff --git a/kolla/docker/mariadb-server/extend_start.sh b/kolla/docker/mariadb-server/extend_start.sh index f14c85949..45065ac9c 100644 --- a/kolla/docker/mariadb-server/extend_start.sh +++ b/kolla/docker/mariadb-server/extend_start.sh @@ -28,14 +28,6 @@ function bootstrap_db { set -o xtrace } -# Create log directory, with appropriate permissions -if [[ ! -d "${MARIADB_LOG_DIR}" ]]; then - mkdir -p ${MARIADB_LOG_DIR} -fi -if [[ $(stat -c %a ${MARIADB_LOG_DIR}) != "755" ]]; then - chmod 755 ${MARIADB_LOG_DIR} -fi - # This catches all cases of the BOOTSTRAP variable being set, including empty if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then mariadb-install-db 2>&1 | tee -a ${MARIADB_LOG_DIR}/mariadb-bootstrap.log diff --git a/kolla/docker/masakari/masakari-base/extend_start.sh b/kolla/docker/masakari/masakari-base/extend_start.sh index 4f13d3e8b..9965e61ab 100755 --- a/kolla/docker/masakari/masakari-base/extend_start.sh +++ b/kolla/docker/masakari/masakari-base/extend_start.sh @@ -1,13 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/masakari" ]]; then - mkdir -p /var/log/kolla/masakari -fi -if [[ $(stat -c %U:%G /var/log/kolla/masakari) != "masakari:kolla" ]]; then - chown -R masakari:kolla /var/log/kolla/masakari -fi -if [[ $(stat -c %a /var/log/kolla/masakari) != "755" ]]; then - chmod 755 /var/log/kolla/masakari -fi - . /usr/local/bin/kolla_masakari_extend_start diff --git a/kolla/docker/mistral/mistral-base/extend_start.sh b/kolla/docker/mistral/mistral-base/extend_start.sh index ac2980d6c..1a102ce2b 100644 --- a/kolla/docker/mistral/mistral-base/extend_start.sh +++ b/kolla/docker/mistral/mistral-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/mistral" ]]; then - mkdir -p /var/log/kolla/mistral -fi -if [[ $(stat -c %a /var/log/kolla/mistral) != "755" ]]; then - chmod 755 /var/log/kolla/mistral -fi - . /usr/local/bin/kolla_mistral_extend_start diff --git a/kolla/docker/neutron/neutron-base/extend_start.sh b/kolla/docker/neutron/neutron-base/extend_start.sh index e2a2dfca4..b47ba887a 100644 --- a/kolla/docker/neutron/neutron-base/extend_start.sh +++ b/kolla/docker/neutron/neutron-base/extend_start.sh @@ -1,12 +1,5 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then - chmod 755 /var/log/kolla/neutron -fi - # NOTE(hrw): from RHEL 9 release notes: # "Iptables-nft and ipset are now deprecated, which included the utilities, # iptables, ip6tables, ebtables, and arptables. These are all replaced by the diff --git a/kolla/docker/neutron/neutron-dhcp-agent/extend_start.sh b/kolla/docker/neutron/neutron-dhcp-agent/extend_start.sh index edaad2a3a..6dc0b2151 100644 --- a/kolla/docker/neutron/neutron-dhcp-agent/extend_start.sh +++ b/kolla/docker/neutron/neutron-dhcp-agent/extend_start.sh @@ -1,11 +1,3 @@ -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ ! -f "/var/log/kolla/neutron/dnsmasq.log" ]]; then - touch /var/log/kolla/neutron/dnsmasq.log - chown neutron:kolla /var/log/kolla/neutron/dnsmasq.log -fi - if [[ "${KOLLA_NEUTRON_WRAPPERS:-false}" == "true" ]]; then echo "Copying neutron agent wrappers to /usr/local/bin" sudo -E /usr/local/lib/neutron-wrappers/copy-wrappers diff --git a/kolla/docker/neutron/neutron-l3-agent/extend_start.sh b/kolla/docker/neutron/neutron-l3-agent/extend_start.sh index f95c1eda2..b9c77dd57 100644 --- a/kolla/docker/neutron/neutron-l3-agent/extend_start.sh +++ b/kolla/docker/neutron/neutron-l3-agent/extend_start.sh @@ -1,10 +1,4 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then - chmod 755 /var/log/kolla/neutron -fi # NOTE(hrw): from RHEL 9 release notes: # "Iptables-nft and ipset are now deprecated, which included the utilities, diff --git a/kolla/docker/neutron/neutron-metadata-agent/extend_start.sh b/kolla/docker/neutron/neutron-metadata-agent/extend_start.sh index 001898f68..7a45654d6 100644 --- a/kolla/docker/neutron/neutron-metadata-agent/extend_start.sh +++ b/kolla/docker/neutron/neutron-metadata-agent/extend_start.sh @@ -1,12 +1,5 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then - chmod 755 /var/log/kolla/neutron -fi - if [[ "${KOLLA_NEUTRON_WRAPPERS:-false}" == "true" ]]; then echo "Copying neutron agent wrappers to /usr/local/bin" sudo -E /usr/local/lib/neutron-wrappers/copy-wrappers diff --git a/kolla/docker/nova/nova-base/extend_start.sh b/kolla/docker/nova/nova-base/extend_start.sh index eee0f16a1..d71672dfb 100644 --- a/kolla/docker/nova/nova-base/extend_start.sh +++ b/kolla/docker/nova/nova-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/nova" ]]; then - mkdir -p /var/log/kolla/nova -fi -if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then - chmod 755 /var/log/kolla/nova -fi - . /usr/local/bin/kolla_nova_extend_start diff --git a/kolla/docker/nova/nova-libvirt-spice/extend_start.sh b/kolla/docker/nova/nova-libvirt-spice/extend_start.sh index cc41b480b..a9bf588e2 100644 --- a/kolla/docker/nova/nova-libvirt-spice/extend_start.sh +++ b/kolla/docker/nova/nova-libvirt-spice/extend_start.sh @@ -1,11 +1 @@ #!/bin/bash - -if [[ ! -e "/var/log/kolla/libvirt/libvirtd.log" ]]; then - mkdir -p /var/log/kolla/libvirt - touch /var/log/kolla/libvirt/libvirtd.log - chmod 644 /var/log/kolla/libvirt/libvirtd.log -fi -if [[ $(stat -c %a /var/log/kolla/libvirt) != "755" ]]; then - chmod 755 /var/log/kolla/libvirt - chmod 644 /var/log/kolla/libvirt/libvirtd.log -fi diff --git a/kolla/docker/nova/nova-libvirt/extend_start.sh b/kolla/docker/nova/nova-libvirt/extend_start.sh index cc41b480b..a9bf588e2 100644 --- a/kolla/docker/nova/nova-libvirt/extend_start.sh +++ b/kolla/docker/nova/nova-libvirt/extend_start.sh @@ -1,11 +1 @@ #!/bin/bash - -if [[ ! -e "/var/log/kolla/libvirt/libvirtd.log" ]]; then - mkdir -p /var/log/kolla/libvirt - touch /var/log/kolla/libvirt/libvirtd.log - chmod 644 /var/log/kolla/libvirt/libvirtd.log -fi -if [[ $(stat -c %a /var/log/kolla/libvirt) != "755" ]]; then - chmod 755 /var/log/kolla/libvirt - chmod 644 /var/log/kolla/libvirt/libvirtd.log -fi diff --git a/kolla/docker/octavia/octavia-base/extend_start.sh b/kolla/docker/octavia/octavia-base/extend_start.sh index b27a88a31..e287a36ae 100644 --- a/kolla/docker/octavia/octavia-base/extend_start.sh +++ b/kolla/docker/octavia/octavia-base/extend_start.sh @@ -1,17 +1,3 @@ #!/bin/bash -set -o errexit - -OCTAVIA_LOG_DIR=/var/log/kolla/octavia - -if [[ ! -d "${OCTAVIA_LOG_DIR}" ]]; then - mkdir -p ${OCTAVIA_LOG_DIR} -fi -if [[ $(stat -c %U:%G ${OCTAVIA_LOG_DIR}) != "octavia:kolla" ]]; then - chown -R octavia:kolla /var/log/kolla/octavia -fi -if [[ $(stat -c %a ${OCTAVIA_LOG_DIR}) != "755" ]]; then - chmod 755 ${OCTAVIA_LOG_DIR} -fi - . /usr/local/bin/kolla_octavia_extend_start diff --git a/kolla/docker/opensearch/opensearch-dashboards/extend_start.sh b/kolla/docker/opensearch/opensearch-dashboards/extend_start.sh index 608bb34bf..d3fc1366a 100644 --- a/kolla/docker/opensearch/opensearch-dashboards/extend_start.sh +++ b/kolla/docker/opensearch/opensearch-dashboards/extend_start.sh @@ -1,12 +1,5 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/opensearch-dashboards" ]]; then - mkdir -p /var/log/kolla/opensearch-dashboards -fi -if [[ $(stat -c %a /var/log/kolla/opensearch-dashboards) != "755" ]]; then - chmod 755 /var/log/kolla/opensearch-dashboards -fi - export DASHBOARDS_HOME=/usr/share/opensearch-dashboards PLUGIN_LIST=$($DASHBOARDS_HOME/bin/opensearch-dashboards-plugin list) diff --git a/kolla/docker/opensearch/opensearch/extend_start.sh b/kolla/docker/opensearch/opensearch/extend_start.sh index 5855b1be2..05a7907cf 100644 --- a/kolla/docker/opensearch/opensearch/extend_start.sh +++ b/kolla/docker/opensearch/opensearch/extend_start.sh @@ -1,8 +1,2 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/opensearch" ]]; then - mkdir -p /var/log/kolla/opensearch -fi -if [[ $(stat -c %a /var/log/kolla/opensearch) != "755" ]]; then - chmod 755 /var/log/kolla/opensearch -fi diff --git a/kolla/docker/openvswitch/openvswitch-base/extend_start.sh b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh index 1b0ed1300..5e0357cda 100644 --- a/kolla/docker/openvswitch/openvswitch-base/extend_start.sh +++ b/kolla/docker/openvswitch/openvswitch-base/extend_start.sh @@ -1,12 +1,4 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/openvswitch" ]]; then - mkdir -p /var/log/kolla/openvswitch -fi -if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then - chmod 755 /var/log/kolla/openvswitch -fi - -chown -R openvswitch:openvswitch /var/log/kolla/openvswitch . /usr/local/bin/kolla_openvswitch_extend_start diff --git a/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh index d25038bdd..b8f4a6e34 100644 --- a/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh +++ b/kolla/docker/openvswitch/openvswitch-db-server/extend_start.sh @@ -9,7 +9,3 @@ if [[ $(ovsdb-tool needs-conversion /var/lib/openvswitch/conf.db) == yes ]]; the ovsdb-tool convert "/var/lib/openvswitch/conf.db" fi -if [[ ! -r "/var/log/kolla/openvswitch/ovsdb-server.log" ]]; then - touch /var/log/kolla/openvswitch/ovsdb-server.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovsdb-server.log -fi diff --git a/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh b/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh index fde542130..e2fc55465 100644 --- a/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh +++ b/kolla/docker/openvswitch/openvswitch-vswitchd/extend_start.sh @@ -1,8 +1,3 @@ #!/bin/bash -if [[ ! -r "/var/log/kolla/openvswitch/ovs-vswitchd.log" ]]; then - touch /var/log/kolla/openvswitch/ovs-vswitchd.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovs-vswitchd.log -fi - modprobe openvswitch diff --git a/kolla/docker/ovn/ovn-base/extend_start.sh b/kolla/docker/ovn/ovn-base/extend_start.sh index eae4ab9e1..7de34a5a8 100644 --- a/kolla/docker/ovn/ovn-base/extend_start.sh +++ b/kolla/docker/ovn/ovn-base/extend_start.sh @@ -3,11 +3,5 @@ if [[ ! -d "/run/ovn" ]]; then mkdir -p /run/ovn fi -if [[ ! -d "/var/log/kolla/openvswitch" ]]; then - mkdir -p /var/log/kolla/openvswitch -fi -if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then - chmod 755 /var/log/kolla/openvswitch -fi . /usr/local/bin/kolla_ovn_extend_start diff --git a/kolla/docker/ovn/ovn-controller/extend_start.sh b/kolla/docker/ovn/ovn-controller/extend_start.sh index 8080ea7c8..05a7907cf 100644 --- a/kolla/docker/ovn/ovn-controller/extend_start.sh +++ b/kolla/docker/ovn/ovn-controller/extend_start.sh @@ -1,6 +1,2 @@ #!/bin/bash -if [[ ! -r "/var/log/kolla/openvswitch/ovn-controller.log" ]]; then - touch /var/log/kolla/openvswitch/ovn-controller.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-controller.log -fi diff --git a/kolla/docker/ovn/ovn-nb-db-server/extend_start.sh b/kolla/docker/ovn/ovn-nb-db-server/extend_start.sh index 4c0e742f5..05a7907cf 100644 --- a/kolla/docker/ovn/ovn-nb-db-server/extend_start.sh +++ b/kolla/docker/ovn/ovn-nb-db-server/extend_start.sh @@ -1,6 +1,2 @@ #!/bin/bash -if [[ ! -r "/var/log/kolla/openvswitch/ovn-nb-db.log" ]]; then - touch /var/log/kolla/openvswitch/ovn-nb-db.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-nb-db.log -fi diff --git a/kolla/docker/ovn/ovn-northd/extend_start.sh b/kolla/docker/ovn/ovn-northd/extend_start.sh index c832c5383..a9bf588e2 100644 --- a/kolla/docker/ovn/ovn-northd/extend_start.sh +++ b/kolla/docker/ovn/ovn-northd/extend_start.sh @@ -1,5 +1 @@ #!/bin/bash -if [[ ! -r "/var/log/kolla/openvswitch/ovn-northd.log" ]]; then - touch /var/log/kolla/openvswitch/ovn-northd.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-northd.log -fi diff --git a/kolla/docker/ovn/ovn-sb-db-relay/extend_start.sh b/kolla/docker/ovn/ovn-sb-db-relay/extend_start.sh index 04b6c5357..05a7907cf 100644 --- a/kolla/docker/ovn/ovn-sb-db-relay/extend_start.sh +++ b/kolla/docker/ovn/ovn-sb-db-relay/extend_start.sh @@ -1,6 +1,2 @@ #!/bin/bash -if [[ ! -r "/var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log" ]]; then - touch /var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-sb-relay-${RELAY_ID}.log -fi diff --git a/kolla/docker/ovn/ovn-sb-db-server/extend_start.sh b/kolla/docker/ovn/ovn-sb-db-server/extend_start.sh index 07bcd1b45..05a7907cf 100644 --- a/kolla/docker/ovn/ovn-sb-db-server/extend_start.sh +++ b/kolla/docker/ovn/ovn-sb-db-server/extend_start.sh @@ -1,6 +1,2 @@ #!/bin/bash -if [[ ! -r "/var/log/kolla/openvswitch/ovn-sb-db.log" ]]; then - touch /var/log/kolla/openvswitch/ovn-sb-db.log - chown openvswitch:openvswitch /var/log/kolla/openvswitch/ovn-sb-db.log -fi diff --git a/kolla/docker/ovsdpdk/ovsdpdk/extend_start.sh b/kolla/docker/ovsdpdk/ovsdpdk/extend_start.sh index 60ab0c088..3a8c12f64 100644 --- a/kolla/docker/ovsdpdk/ovsdpdk/extend_start.sh +++ b/kolla/docker/ovsdpdk/ovsdpdk/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/openvswitch" ]]; then - mkdir -p /var/log/kolla/openvswitch -fi -if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then - chmod 755 /var/log/kolla/openvswitch -fi - . /usr/local/bin/kolla_ovsdpdk_extend_start diff --git a/kolla/docker/placement/placement-base/extend_start.sh b/kolla/docker/placement/placement-base/extend_start.sh index 900ea8447..fbb479b31 100644 --- a/kolla/docker/placement/placement-base/extend_start.sh +++ b/kolla/docker/placement/placement-base/extend_start.sh @@ -1,15 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/placement" ]]; then - mkdir -p /var/log/kolla/placement - touch /var/log/kolla/placement/placement-api.log -fi -if [[ $(stat -c %U:%G /var/log/kolla/placement) != "placement:kolla" ]]; then - chown -R placement:kolla /var/log/kolla/placement -fi -if [[ $(stat -c %a /var/log/kolla/placement) != "755" ]]; then - chmod 755 /var/log/kolla/placement - chmod 644 /var/log/kolla/placement/placement-api.log -fi - . /usr/local/bin/kolla_placement_extend_start diff --git a/kolla/docker/prometheus/prometheus-base/extend_start.sh b/kolla/docker/prometheus/prometheus-base/extend_start.sh index 8613330c6..a9bf588e2 100644 --- a/kolla/docker/prometheus/prometheus-base/extend_start.sh +++ b/kolla/docker/prometheus/prometheus-base/extend_start.sh @@ -1,9 +1 @@ #!/bin/bash - -# Create log directory, with appropriate permissions -if [[ ! -d "/var/log/kolla/prometheus" ]]; then - mkdir -p /var/log/kolla/prometheus -fi -if [[ $(stat -c %a /var/log/kolla/prometheus) != "755" ]]; then - chmod 755 /var/log/kolla/prometheus -fi diff --git a/kolla/docker/proxysql/kolla_extend_start b/kolla/docker/proxysql/kolla_extend_start index 229e8ada2..91cbd0707 100644 --- a/kolla/docker/proxysql/kolla_extend_start +++ b/kolla/docker/proxysql/kolla_extend_start @@ -1,12 +1,6 @@ #!/bin/bash PROXYSQL_LIB_DIR="/var/lib/proxysql" -PROXYSQL_LOG_DIR="/var/log/kolla/proxysql" - -if [[ ! -d "${PROXYSQL_LOG_DIR}" ]]; then - mkdir -p "${PROXYSQL_LOG_DIR}" -fi -chown -R proxysql:kolla "${PROXYSQL_LOG_DIR}" # Remove old pid rm -f ${PROXYSQL_LIB_DIR}/proxysql.pid diff --git a/kolla/docker/rabbitmq/extend_start.sh b/kolla/docker/rabbitmq/extend_start.sh index ef28d2b5f..858d3aa16 100644 --- a/kolla/docker/rabbitmq/extend_start.sh +++ b/kolla/docker/rabbitmq/extend_start.sh @@ -1,7 +1,5 @@ #!/bin/bash -: ${RABBITMQ_LOG_DIR:=/var/log/kolla/rabbitmq} - # 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 @@ -16,11 +14,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then chmod 400 /var/lib/rabbitmq/.erlang.cookie exit 0 fi - -if [[ ! -d "${RABBITMQ_LOG_DIR}" ]]; then - mkdir -p ${RABBITMQ_LOG_DIR} -fi - -if [[ $(stat -c %a ${RABBITMQ_LOG_DIR}) != "755" ]]; then - chmod 755 ${RABBITMQ_LOG_DIR} -fi diff --git a/kolla/docker/skyline/skyline-base/extend_start.sh b/kolla/docker/skyline/skyline-base/extend_start.sh index 34362ad04..b530ae169 100644 --- a/kolla/docker/skyline/skyline-base/extend_start.sh +++ b/kolla/docker/skyline/skyline-base/extend_start.sh @@ -1,15 +1,5 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/skyline" ]]; then - mkdir -p /var/log/kolla/skyline -fi -if [[ $(stat -c %U:%G /var/log/kolla/skyline) != "skyline:kolla" ]]; then - chown skyline:kolla /var/log/kolla/skyline -fi -if [[ $(stat -c %a /var/log/kolla/skyline) != "755" ]]; then - chmod 755 /var/log/kolla/skyline -fi - if [[ ! -d "/var/lib/skyline" ]]; then mkdir -p /var/lib/skyline fi diff --git a/kolla/docker/tacker/tacker-base/extend_start.sh b/kolla/docker/tacker/tacker-base/extend_start.sh index a3b7db8d3..9bc5d9fe6 100644 --- a/kolla/docker/tacker/tacker-base/extend_start.sh +++ b/kolla/docker/tacker/tacker-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/tacker" ]]; then - mkdir -p /var/log/kolla/tacker -fi -if [[ $(stat -c %a /var/log/kolla/tacker) != "755" ]]; then - chmod 755 /var/log/kolla/tacker -fi - . /usr/local/bin/kolla_tacker_extend_start diff --git a/kolla/docker/trove/trove-base/extend_start.sh b/kolla/docker/trove/trove-base/extend_start.sh index 581a83d7b..d1acc54d2 100644 --- a/kolla/docker/trove/trove-base/extend_start.sh +++ b/kolla/docker/trove/trove-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/trove" ]]; then - mkdir -p /var/log/kolla/trove -fi -if [[ $(stat -c %a /var/log/kolla/trove) != "755" ]]; then - chmod 755 /var/log/kolla/trove -fi - . /usr/local/bin/kolla_trove_extend_start diff --git a/kolla/docker/valkey/valkey-base/extend_start.sh b/kolla/docker/valkey/valkey-base/extend_start.sh index 3a3a321d4..05a7907cf 100644 --- a/kolla/docker/valkey/valkey-base/extend_start.sh +++ b/kolla/docker/valkey/valkey-base/extend_start.sh @@ -1,9 +1,2 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/valkey" ]]; then - mkdir -p /var/log/kolla/valkey -fi - -if [[ $(stat -c %a /var/log/kolla/valkey) != "755" ]]; then - chmod 755 /var/log/kolla/valkey -fi diff --git a/kolla/docker/valkey/valkey-sentinel/extend_start.sh b/kolla/docker/valkey/valkey-sentinel/extend_start.sh index e6af42ef6..9e5e5578d 100644 --- a/kolla/docker/valkey/valkey-sentinel/extend_start.sh +++ b/kolla/docker/valkey/valkey-sentinel/extend_start.sh @@ -1,13 +1,5 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/valkey" ]]; then - mkdir -p /var/log/kolla/valkey -fi - -if [[ $(stat -c %a /var/log/kolla/valkey) != "755" ]]; then - chmod 755 /var/log/kolla/valkey -fi - # The CONFIG REWRITE command rewrites the valkey.conf # file the server was started with, applying the minimal # changes needed to make it reflect the configuration diff --git a/kolla/docker/watcher/watcher-base/extend_start.sh b/kolla/docker/watcher/watcher-base/extend_start.sh index 9e27a9cf0..217ff2910 100644 --- a/kolla/docker/watcher/watcher-base/extend_start.sh +++ b/kolla/docker/watcher/watcher-base/extend_start.sh @@ -1,10 +1,3 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/watcher" ]]; then - mkdir -p /var/log/kolla/watcher -fi -if [[ $(stat -c %a /var/log/kolla/watcher) != "755" ]]; then - chmod 755 /var/log/kolla/watcher -fi - . /usr/local/bin/kolla_watcher_extend_start |