Remove httpd_setup calls from api containers

We have dropped mod_wsgi support from services in [1].

[1]: https://review.opendev.org/c/openstack/kolla-ansible/+/982414

Change-Id: Ie5da8427706dfb74bad4e174c990355a6870114c
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>

21 files changed, 0 insertions, 47 deletions

diff --git a/docker/aodh/aodh-api/extend_start.sh b/docker/aodh/aodh-api/extend_start.sh
index 07d4ce760..575b0e584 100644
--- a/docker/aodh/aodh-api/extend_start.sh
+++ b/docker/aodh/aodh-api/extend_start.sh
@@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     aodh-dbsync
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/barbican/barbican-api/extend_start.sh b/docker/barbican/barbican-api/extend_start.sh
index 317f7d7d6..c541d0343 100755
--- a/docker/barbican/barbican-api/extend_start.sh
+++ b/docker/barbican/barbican-api/extend_start.sh
@@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     barbican-db-manage upgrade
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh
index a5492b082..94b0fe875 100644
--- a/docker/cinder/cinder-api/extend_start.sh
+++ b/docker/cinder/cinder-api/extend_start.sh
@@ -12,5 +12,3 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then
     cinder-manage db online_data_migrations
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh
index 2b144fa3f..26d4a8c36 100644
--- a/docker/cloudkitty/cloudkitty-api/extend_start.sh
+++ b/docker/cloudkitty/cloudkitty-api/extend_start.sh
@@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     cloudkitty-storage-init
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/docker/cyborg/cyborg-api/extend_start.sh
index 63c62ef93..b1c7af7af 100644
--- a/docker/cyborg/cyborg-api/extend_start.sh
+++ b/docker/cyborg/cyborg-api/extend_start.sh
@@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     cyborg-dbsync upgrade
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/gnocchi/gnocchi-api/extend_start.sh b/docker/gnocchi/gnocchi-api/extend_start.sh
index 84f33e103..dda0461c6 100644
--- a/docker/gnocchi/gnocchi-api/extend_start.sh
+++ b/docker/gnocchi/gnocchi-api/extend_start.sh
@@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     sudo -H -u gnocchi gnocchi-upgrade --log-file /var/log/kolla/gnocchi/gnocchi-upgrade.log
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index 0384b7a56..b5891b098 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -7,9 +7,6 @@ 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 644 /usr/local/bin/kolla_heat_extend_start
-
 {{ macros.kolla_patch_sources() }}
 
 {% block heat_api_cfn_footer %}{% endblock %}
diff --git a/docker/heat/heat-api-cfn/extend_start.sh b/docker/heat/heat-api-cfn/extend_start.sh
deleted file mode 100644
index c55f0b199..000000000
--- a/docker/heat/heat-api-cfn/extend_start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh
index ba5f1450d..ddf4f81f4 100644
--- a/docker/heat/heat-api/extend_start.sh
+++ b/docker/heat/heat-api/extend_start.sh
@@ -15,5 +15,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
 
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 59d6b19d6..7ada4c0f2 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -245,5 +245,3 @@ 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
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh
index b03feb65d..ce2f7fb3e 100644
--- a/docker/ironic/ironic-api/extend_start.sh
+++ b/docker/ironic/ironic-api/extend_start.sh
@@ -17,5 +17,3 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then
     ironic-dbsync online_data_migrations
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2
index 09ab2b7fc..3fdf78167 100644
--- a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2
+++ b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2
@@ -32,9 +32,6 @@ RUN echo > /etc/apache2/ports.conf
 
 ENV IRONIC_CONFIG /etc/ironic/ironic.conf
 
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
 {{ macros.kolla_patch_sources() }}
 
 {% block ironic_prometheus_exporter_footer %}{% endblock %}
diff --git a/docker/ironic/ironic-prometheus-exporter/extend_start.sh b/docker/ironic/ironic-prometheus-exporter/extend_start.sh
deleted file mode 100644
index c55f0b199..000000000
--- a/docker/ironic/ironic-prometheus-exporter/extend_start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh
index 25220b683..b45c94d0d 100644
--- a/docker/keystone/keystone/extend_start.sh
+++ b/docker/keystone/keystone/extend_start.sh
@@ -44,6 +44,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     sudo -H -u keystone keystone-manage ${EXTRA_KEYSTONE_MANAGE_ARGS} db_sync
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
-
diff --git a/docker/manila/manila-api/extend_start.sh b/docker/manila/manila-api/extend_start.sh
index 925d5bf60..bea77dbba 100644
--- a/docker/manila/manila-api/extend_start.sh
+++ b/docker/manila/manila-api/extend_start.sh
@@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     manila-manage db sync
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/masakari/masakari-api/extend_start.sh b/docker/masakari/masakari-api/extend_start.sh
index 0e0d917a2..549759f49 100755
--- a/docker/masakari/masakari-api/extend_start.sh
+++ b/docker/masakari/masakari-api/extend_start.sh
@@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     masakari-manage db sync
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/mistral/mistral-api/extend_start.sh b/docker/mistral/mistral-api/extend_start.sh
index 149554191..113adb8a2 100644
--- a/docker/mistral/mistral-api/extend_start.sh
+++ b/docker/mistral/mistral-api/extend_start.sh
@@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     mistral-db-manage --config-file /etc/mistral/mistral.conf populate
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh
index 40210f81c..ead6c252b 100644
--- a/docker/nova/nova-api/extend_start.sh
+++ b/docker/nova/nova-api/extend_start.sh
@@ -28,5 +28,3 @@ if [[ "${!KOLLA_UPGRADE_CHECK[@]}" ]]; then
     nova-status upgrade check
     exit $?
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/octavia/octavia-api/extend_start.sh b/docker/octavia/octavia-api/extend_start.sh
index 3c45e2558..b05d8abf1 100644
--- a/docker/octavia/octavia-api/extend_start.sh
+++ b/docker/octavia/octavia-api/extend_start.sh
@@ -7,5 +7,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     octavia-db-manage upgrade_persistence
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/placement/placement-api/extend_start.sh b/docker/placement/placement-api/extend_start.sh
index 0dd48948f..e468cbcaf 100644
--- a/docker/placement/placement-api/extend_start.sh
+++ b/docker/placement/placement-api/extend_start.sh
@@ -19,5 +19,3 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then
     placement-manage db online_data_migrations
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup
diff --git a/docker/trove/trove-api/extend_start.sh b/docker/trove/trove-api/extend_start.sh
index 02314baa7..76839e2d4 100644
--- a/docker/trove/trove-api/extend_start.sh
+++ b/docker/trove/trove-api/extend_start.sh
@@ -6,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     trove-manage db_sync
     exit 0
 fi
-
-. /usr/local/bin/kolla_httpd_setup