Synchronise master with upstream

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

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

kolla/docker/base/Dockerfile.j2

@@ -118,8 +118,6 @@ RUN {{ macros.install_packages(base_rocky_yum_repo_packages | customizable("rock
 {# We are back to the basic if conditional here which is:
     if base_package_type == 'rpm' #}
 
-{% block base_redhat_binary_versionlock %}{% endblock %}
-
 {% set base_rocky_packages = [
         'ca-certificates',
         'crypto-policies-scripts',

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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