From e2e0fd288f52b62bbd0fda75a79261c4c2b8b51e Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 25 Sep 2015 13:00:55 +0000
Subject: [PATCH] Remove config-external.sh
Removes config-external for all services that have been replaced in
Ansible
Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea
Partially-Implements: blueprint replace-config-external
---
docker/cinder/cinder-api/config-external.sh | 10 ------
.../cinder/cinder-backup/config-external.sh | 10 ------
.../cinder-scheduler/config-external.sh | 10 ------
.../cinder/cinder-volume/config-external.sh | 10 ------
docker/glance/glance-api/config-external.sh | 10 ------
.../glance/glance-registry/config-external.sh | 10 ------
docker/haproxy/config-external.sh | 10 ------
docker/heat/heat-api-cfn/config-external.sh | 10 ------
docker/heat/heat-api/config-external.sh | 10 ------
docker/heat/heat-engine/config-external.sh | 10 ------
docker/horizon/config-external.sh | 26 ---------------
docker/keepalived/config-external.sh | 10 ------
docker/keystone/config-external.sh | 25 --------------
docker/mariadb/config-external.sh | 11 -------
docker/memcached/config-external.sh | 17 ----------
docker/murano/murano-api/config-external.sh | 10 ------
.../murano/murano-engine/config-external.sh | 10 ------
.../config-external.sh | 20 -----------
.../config-external.sh | 20 -----------
.../neutron/neutron-server/config-external.sh | 20 -----------
docker/nova/nova-api/config-external.sh | 10 ------
docker/nova/nova-compute/config-external.sh | 10 ------
docker/nova/nova-conductor/config-external.sh | 10 ------
.../nova/nova-consoleauth/config-external.sh | 10 ------
docker/nova/nova-libvirt/config-external.sh | 10 ------
docker/nova/nova-network/config-external.sh | 10 ------
.../nova/nova-novncproxy/config-external.sh | 10 ------
docker/nova/nova-scheduler/config-external.sh | 10 ------
.../ovs-db-server/config-external.sh | 3 --
.../ovs-vswitchd/config-external.sh | 3 --
docker/rabbitmq/config-external.sh | 19 -----------
.../swift-account-auditor/config-external.sh | 19 -----------
.../swift-account-reaper/config-external.sh | 19 -----------
.../config-external.sh | 19 -----------
.../swift-account-server/config-external.sh | 19 -----------
.../config-external.sh | 21 ------------
.../config-external.sh | 21 ------------
.../swift-container-server/config-external.sh | 21 ------------
.../config-external.sh | 27 ---------------
.../swift-object-auditor/config-external.sh | 27 ---------------
.../swift-object-expirer/config-external.sh | 33 -------------------
.../config-external.sh | 27 ---------------
.../swift-object-server/config-external.sh | 27 ---------------
.../swift-object-updater/config-external.sh | 27 ---------------
.../swift-proxy-server/config-external.sh | 33 -------------------
docker/swift/swift-rsyncd/config-external.sh | 9 -----
46 files changed, 723 deletions(-)
delete mode 100644 docker/cinder/cinder-api/config-external.sh
delete mode 100644 docker/cinder/cinder-backup/config-external.sh
delete mode 100644 docker/cinder/cinder-scheduler/config-external.sh
delete mode 100755 docker/cinder/cinder-volume/config-external.sh
delete mode 100755 docker/glance/glance-api/config-external.sh
delete mode 100755 docker/glance/glance-registry/config-external.sh
delete mode 100644 docker/haproxy/config-external.sh
delete mode 100644 docker/heat/heat-api-cfn/config-external.sh
delete mode 100644 docker/heat/heat-api/config-external.sh
delete mode 100644 docker/heat/heat-engine/config-external.sh
delete mode 100644 docker/horizon/config-external.sh
delete mode 100755 docker/keepalived/config-external.sh
delete mode 100644 docker/keystone/config-external.sh
delete mode 100644 docker/mariadb/config-external.sh
delete mode 100644 docker/memcached/config-external.sh
delete mode 100644 docker/murano/murano-api/config-external.sh
delete mode 100644 docker/murano/murano-engine/config-external.sh
delete mode 100755 docker/neutron/neutron-linuxbridge-agent/config-external.sh
delete mode 100755 docker/neutron/neutron-openvswitch-agent/config-external.sh
delete mode 100755 docker/neutron/neutron-server/config-external.sh
delete mode 100755 docker/nova/nova-api/config-external.sh
delete mode 100755 docker/nova/nova-compute/config-external.sh
delete mode 100755 docker/nova/nova-conductor/config-external.sh
delete mode 100755 docker/nova/nova-consoleauth/config-external.sh
delete mode 100755 docker/nova/nova-libvirt/config-external.sh
delete mode 100755 docker/nova/nova-network/config-external.sh
delete mode 100755 docker/nova/nova-novncproxy/config-external.sh
delete mode 100755 docker/nova/nova-scheduler/config-external.sh
delete mode 100644 docker/openvswitch/ovs-db-server/config-external.sh
delete mode 100644 docker/openvswitch/ovs-vswitchd/config-external.sh
delete mode 100644 docker/rabbitmq/config-external.sh
delete mode 100644 docker/swift/swift-account-auditor/config-external.sh
delete mode 100644 docker/swift/swift-account-reaper/config-external.sh
delete mode 100644 docker/swift/swift-account-replicator/config-external.sh
delete mode 100644 docker/swift/swift-account-server/config-external.sh
delete mode 100644 docker/swift/swift-container-auditor/config-external.sh
delete mode 100644 docker/swift/swift-container-replicator/config-external.sh
delete mode 100644 docker/swift/swift-container-server/config-external.sh
delete mode 100644 docker/swift/swift-container-updater/config-external.sh
delete mode 100644 docker/swift/swift-object-auditor/config-external.sh
delete mode 100644 docker/swift/swift-object-expirer/config-external.sh
delete mode 100644 docker/swift/swift-object-replicator/config-external.sh
delete mode 100644 docker/swift/swift-object-server/config-external.sh
delete mode 100644 docker/swift/swift-object-updater/config-external.sh
delete mode 100755 docker/swift/swift-proxy-server/config-external.sh
delete mode 100644 docker/swift/swift-rsyncd/config-external.sh
diff --git a/docker/cinder/cinder-api/config-external.sh b/docker/cinder/cinder-api/config-external.sh
deleted file mode 100644
index 08d8cde0a2..0000000000
--- a/docker/cinder/cinder-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/cinder-api/cinder.conf"
-TARGET="/etc/cinder/cinder.conf"
-OWNER="cinder"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/cinder/cinder-backup/config-external.sh b/docker/cinder/cinder-backup/config-external.sh
deleted file mode 100644
index ff4752492b..0000000000
--- a/docker/cinder/cinder-backup/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/cinder-backup/cinder.conf"
-TARGET="/etc/cinder/cinder.conf"
-OWNER="cinder"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/cinder/cinder-scheduler/config-external.sh b/docker/cinder/cinder-scheduler/config-external.sh
deleted file mode 100644
index 3c8ca26be1..0000000000
--- a/docker/cinder/cinder-scheduler/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/cinder-scheduler/cinder.conf"
-TARGET="/etc/cinder/cinder.conf"
-OWNER="cinder"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/cinder/cinder-volume/config-external.sh b/docker/cinder/cinder-volume/config-external.sh
deleted file mode 100755
index 2f6b99fc9c..0000000000
--- a/docker/cinder/cinder-volume/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/cinder-volume/cinder.conf"
-TARGET="/etc/cinder/cinder.conf"
-OWNER="cinder"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/glance/glance-api/config-external.sh b/docker/glance/glance-api/config-external.sh
deleted file mode 100755
index ce54117381..0000000000
--- a/docker/glance/glance-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/glance-api/glance-api.conf"
-TARGET="/etc/glance/glance-api.conf"
-OWNER="glance"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/glance/glance-registry/config-external.sh b/docker/glance/glance-registry/config-external.sh
deleted file mode 100755
index 37abd136da..0000000000
--- a/docker/glance/glance-registry/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/glance-registry/glance-registry.conf"
-TARGET="/etc/glance/glance-registry.conf"
-OWNER="glance"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/haproxy/config-external.sh b/docker/haproxy/config-external.sh
deleted file mode 100644
index 0c41a5bdbb..0000000000
--- a/docker/haproxy/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/haproxy/haproxy.cfg"
-TARGET="/etc/haproxy/haproxy.cfg"
-OWNER="root"
-
-if [[ -f "$SOURCE" ]]; then
- cp -f $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/heat/heat-api-cfn/config-external.sh b/docker/heat/heat-api-cfn/config-external.sh
deleted file mode 100644
index 91d5742f19..0000000000
--- a/docker/heat/heat-api-cfn/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/heat-api-cfn/heat.conf"
-TARGET="/etc/heat/heat.conf"
-OWNER="heat"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/heat/heat-api/config-external.sh b/docker/heat/heat-api/config-external.sh
deleted file mode 100644
index 2da92b2031..0000000000
--- a/docker/heat/heat-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/heat-api/heat.conf"
-TARGET="/etc/heat/heat.conf"
-OWNER="heat"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/heat/heat-engine/config-external.sh b/docker/heat/heat-engine/config-external.sh
deleted file mode 100644
index bde0ffe0de..0000000000
--- a/docker/heat/heat-engine/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/heat-engine/heat.conf"
-TARGET="/etc/heat/heat.conf"
-OWNER="heat"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/horizon/config-external.sh b/docker/horizon/config-external.sh
deleted file mode 100644
index 6eaedb3d4b..0000000000
--- a/docker/horizon/config-external.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/horizon/local_settings"
-TARGET="/etc/openstack-dashboard/local_settings"
-OWNER="horizon"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
-
-if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
- "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
- SOURCE="/opt/kolla/horizon/horizon.conf"
- TARGET="/etc/apache2/sites-enabled/000-default.conf"
-else
- SOURCE="/opt/kolla/horizon/horizon.conf"
- TARGET="/etc/httpd/conf.d/horizon.conf"
-
-fi
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/keepalived/config-external.sh b/docker/keepalived/config-external.sh
deleted file mode 100755
index d7ff97826e..0000000000
--- a/docker/keepalived/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/keepalived/keepalived.conf"
-TARGET="/etc/keepalived/keepalived.conf"
-OWNER="root"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/keystone/config-external.sh b/docker/keystone/config-external.sh
deleted file mode 100644
index 1bd4e3bb4e..0000000000
--- a/docker/keystone/config-external.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/keystone/keystone.conf"
-TARGET="/etc/keystone/keystone.conf"
-OWNER="keystone"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
-
-if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
- "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
- SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf"
- TARGET_WSGI="/etc/apache2/conf-enabled/wsgi-keystone.conf"
-else
- SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf"
- TARGET_WSGI="/etc/httpd/conf.d/wsgi-keystone.conf"
-fi
-
-if [[ -f "$SOURCE_WSGI" ]]; then
- cp $SOURCE_WSGI $TARGET_WSGI
- chown ${OWNER}: $TARGET_WSGI
- chmod 0644 $TARGET_WSGI
-fi
diff --git a/docker/mariadb/config-external.sh b/docker/mariadb/config-external.sh
deleted file mode 100644
index 43447a51ca..0000000000
--- a/docker/mariadb/config-external.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/mariadb/galera.cnf"
-TARGET="/etc/my.cnf.d/galera.cnf"
-OWNER="mysql"
-
-# Cluster configuration
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0600 $TARGET
-fi
diff --git a/docker/memcached/config-external.sh b/docker/memcached/config-external.sh
deleted file mode 100644
index d373ddc226..0000000000
--- a/docker/memcached/config-external.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/memcached/memcached.conf"
-TARGET="/etc/memcached.conf"
-OWNER="memcached"
-
-if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
- "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
- OWNER="memcache"
-else
- OWNER="memcached"
-fi
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/murano/murano-api/config-external.sh b/docker/murano/murano-api/config-external.sh
deleted file mode 100644
index ffcdaef0b9..0000000000
--- a/docker/murano/murano-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/murano-api/murano.conf"
-TARGET="/etc/murano/murano.conf"
-OWNER="murano"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/murano/murano-engine/config-external.sh b/docker/murano/murano-engine/config-external.sh
deleted file mode 100644
index af23e0e898..0000000000
--- a/docker/murano/murano-engine/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/murano-engine/murano.conf"
-TARGET="/etc/murano/murano.conf"
-OWNER="murano"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/neutron/neutron-linuxbridge-agent/config-external.sh
deleted file mode 100755
index c44d71d84d..0000000000
--- a/docker/neutron/neutron-linuxbridge-agent/config-external.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/neutron-linuxbridge-agent/neutron.conf"
-TARGET="/etc/neutron/neutron.conf"
-OWNER="neutron"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
-
-SOURCE="/opt/kolla/neutron-linuxbridge-agent/ml2_conf.ini"
-TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
-OWNER="neutron"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/neutron/neutron-openvswitch-agent/config-external.sh b/docker/neutron/neutron-openvswitch-agent/config-external.sh
deleted file mode 100755
index 552d698617..0000000000
--- a/docker/neutron/neutron-openvswitch-agent/config-external.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/neutron-openvswitch-agent/neutron.conf"
-TARGET="/etc/neutron/neutron.conf"
-OWNER="neutron"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
-
-SOURCE="/opt/kolla/neutron-openvswitch-agent/ml2_conf.ini"
-TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
-OWNER="neutron"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/neutron/neutron-server/config-external.sh b/docker/neutron/neutron-server/config-external.sh
deleted file mode 100755
index 574923067f..0000000000
--- a/docker/neutron/neutron-server/config-external.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/neutron-server/neutron.conf"
-TARGET="/etc/neutron/neutron.conf"
-OWNER="neutron"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
-
-SOURCE="/opt/kolla/neutron-server/ml2_conf.ini"
-TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
-OWNER="neutron"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-api/config-external.sh b/docker/nova/nova-api/config-external.sh
deleted file mode 100755
index d0859893d9..0000000000
--- a/docker/nova/nova-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-api/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-compute/config-external.sh b/docker/nova/nova-compute/config-external.sh
deleted file mode 100755
index e844bf50c2..0000000000
--- a/docker/nova/nova-compute/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-compute/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-conductor/config-external.sh b/docker/nova/nova-conductor/config-external.sh
deleted file mode 100755
index ea3b123ec7..0000000000
--- a/docker/nova/nova-conductor/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-conductor/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-consoleauth/config-external.sh b/docker/nova/nova-consoleauth/config-external.sh
deleted file mode 100755
index 1da10d83f2..0000000000
--- a/docker/nova/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-consoleauth/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-libvirt/config-external.sh b/docker/nova/nova-libvirt/config-external.sh
deleted file mode 100755
index acc1c5473b..0000000000
--- a/docker/nova/nova-libvirt/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/libvirt/libvirtd.conf"
-TARGET="/etc/libvirt/libvirtd.conf"
-OWNER="libvirt"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-network/config-external.sh b/docker/nova/nova-network/config-external.sh
deleted file mode 100755
index 7c1d6bb377..0000000000
--- a/docker/nova/nova-network/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-network/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-novncproxy/config-external.sh b/docker/nova/nova-novncproxy/config-external.sh
deleted file mode 100755
index fdc33a5bdc..0000000000
--- a/docker/nova/nova-novncproxy/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-novncproxy/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/nova/nova-scheduler/config-external.sh b/docker/nova/nova-scheduler/config-external.sh
deleted file mode 100755
index 3df0f9b7bb..0000000000
--- a/docker/nova/nova-scheduler/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-scheduler/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/openvswitch/ovs-db-server/config-external.sh b/docker/openvswitch/ovs-db-server/config-external.sh
deleted file mode 100644
index 9ada4efcb1..0000000000
--- a/docker/openvswitch/ovs-db-server/config-external.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-#This file should be a noop. It just needs to exist, but it don't perform any function
diff --git a/docker/openvswitch/ovs-vswitchd/config-external.sh b/docker/openvswitch/ovs-vswitchd/config-external.sh
deleted file mode 100644
index 9ada4efcb1..0000000000
--- a/docker/openvswitch/ovs-vswitchd/config-external.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-#This file should be a noop. It just needs to exist, but it don't perform any function
diff --git a/docker/rabbitmq/config-external.sh b/docker/rabbitmq/config-external.sh
deleted file mode 100644
index 33810d621d..0000000000
--- a/docker/rabbitmq/config-external.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-SOURCE_CONFIG="/opt/kolla/rabbitmq/rabbitmq.config"
-TARGET_CONFIG="/etc/rabbitmq/rabbitmq.config"
-SOURCE_ENV="/opt/kolla/rabbitmq/rabbitmq-env.conf"
-TARGET_ENV="/etc/rabbitmq/rabbitmq-env.conf"
-OWNER="rabbitmq"
-
-# Cluster configuration
-if [[ -f "$SOURCE_CONFIG" ]]; then
- cp -af $SOURCE_CONFIG $TARGET_CONFIG
- chown ${OWNER}: $TARGET_CONFIG
- chmod 0600 $TARGET_CONFIG
-fi
-
-if [[ -f "$SOURCE_ENV" ]]; then
- cp -af $SOURCE_ENV $TARGET_ENV
- chown ${OWNER}: $TARGET_ENV
- chmod 0600 $TARGET_ENV
-fi
diff --git a/docker/swift/swift-account-auditor/config-external.sh b/docker/swift/swift-account-auditor/config-external.sh
deleted file mode 100644
index 955d75341c..0000000000
--- a/docker/swift/swift-account-auditor/config-external.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/
- chown swift: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown swift: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f /opt/kolla/swift-account-auditor/account-auditor.conf ]]; then
- cp /opt/kolla/swift-account-auditor/account-auditor.conf /etc/swift/
- chown swift: /etc/swift/account-auditor.conf
- chmod 0640 /etc/swift/account-auditor.conf
-fi
diff --git a/docker/swift/swift-account-reaper/config-external.sh b/docker/swift/swift-account-reaper/config-external.sh
deleted file mode 100644
index dc2055ab31..0000000000
--- a/docker/swift/swift-account-reaper/config-external.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/
- chown swift: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown swift: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f /opt/kolla/swift-account-reaper/account-reaper.conf ]]; then
- cp /opt/kolla/swift-account-reaper/account-reaper.conf /etc/swift/
- chown swift: /etc/swift/account-reaper.conf
- chmod 0640 /etc/swift/account-reaper.conf
-fi
diff --git a/docker/swift/swift-account-replicator/config-external.sh b/docker/swift/swift-account-replicator/config-external.sh
deleted file mode 100644
index 062c524f25..0000000000
--- a/docker/swift/swift-account-replicator/config-external.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/
- chown swift: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown swift: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f /opt/kolla/swift-account-replicator/account-replicator.conf ]]; then
- cp /opt/kolla/swift-account-replicator/account-replicator.conf /etc/swift/
- chown swift: /etc/swift/account-replicator.conf
- chmod 0640 /etc/swift/account-replicator.conf
-fi
diff --git a/docker/swift/swift-account-server/config-external.sh b/docker/swift/swift-account-server/config-external.sh
deleted file mode 100644
index 61adefcd06..0000000000
--- a/docker/swift/swift-account-server/config-external.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/
- chown swift: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown swift: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f /opt/kolla/swift-account-server/account-server.conf ]]; then
- cp /opt/kolla/swift-account-server/account-server.conf /etc/swift/
- chown swift: /etc/swift/account-server.conf
- chmod 0640 /etc/swift/account-server.conf
-fi
diff --git a/docker/swift/swift-container-auditor/config-external.sh b/docker/swift/swift-container-auditor/config-external.sh
deleted file mode 100644
index e01cc12ae3..0000000000
--- a/docker/swift/swift-container-auditor/config-external.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-container-auditor/container-auditor.conf" ]]; then
- cp /opt/kolla/swift-container-auditor/container-auditor.conf /etc/swift/container-auditor.conf
- chown ${OWNER}: /etc/swift/container-auditor.conf
- chmod 0640 /etc/swift/container-auditor.conf
-fi
diff --git a/docker/swift/swift-container-replicator/config-external.sh b/docker/swift/swift-container-replicator/config-external.sh
deleted file mode 100644
index 439d4ae97a..0000000000
--- a/docker/swift/swift-container-replicator/config-external.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-container-replicator/container-replicator.conf" ]]; then
- cp /opt/kolla/swift-container-replicator/container-replicator.conf /etc/swift/container-replicator.conf
- chown ${OWNER}: /etc/swift/container-replicator.conf
- chmod 0640 /etc/swift/container-replicator.conf
-fi
diff --git a/docker/swift/swift-container-server/config-external.sh b/docker/swift/swift-container-server/config-external.sh
deleted file mode 100644
index d81ba6cc41..0000000000
--- a/docker/swift/swift-container-server/config-external.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-container-server/container-server.conf" ]]; then
- cp /opt/kolla/swift-container-server/container-server.conf /etc/swift/container-server.conf
- chown ${OWNER}: /etc/swift/container-server.conf
- chmod 0640 /etc/swift/container-server.conf
-fi
diff --git a/docker/swift/swift-container-updater/config-external.sh b/docker/swift/swift-container-updater/config-external.sh
deleted file mode 100644
index ea2d3b781a..0000000000
--- a/docker/swift/swift-container-updater/config-external.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown swift: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-container-updater/container-updater.conf" ]]; then
- cp /opt/kolla/swift-container-updater/container-updater.conf /etc/swift/container-updater.conf
- chown ${OWNER}: /etc/swift/container-updater.conf
- chmod 0640 /etc/swift/container-updater.conf
-fi
diff --git a/docker/swift/swift-object-auditor/config-external.sh b/docker/swift/swift-object-auditor/config-external.sh
deleted file mode 100644
index 02be86bfd5..0000000000
--- a/docker/swift/swift-object-auditor/config-external.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then
- cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz
- chown ${OWNER}: /etc/swift/object.ring.gz
- chmod 0640 /etc/swift/object.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-object-auditor/object-auditor.conf" ]]; then
- cp /opt/kolla/swift-object-auditor/object-auditor.conf /etc/swift/object-auditor.conf
- chown ${OWNER}: /etc/swift/object-auditor.conf
- chmod 0640 /etc/swift/object-auditor.conf
-fi
diff --git a/docker/swift/swift-object-expirer/config-external.sh b/docker/swift/swift-object-expirer/config-external.sh
deleted file mode 100644
index 51fe26618d..0000000000
--- a/docker/swift/swift-object-expirer/config-external.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then
- cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz
- chown ${OWNER}: /etc/swift/object.ring.gz
- chmod 0640 /etc/swift/object.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown ${OWNER}: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-object-expirer/object-expirer.conf" ]]; then
- cp /opt/kolla/swift-object-expirer/object-expirer.conf /etc/swift/object-expirer.conf
- chown ${OWNER}: /etc/swift/object-expirer.conf
- chmod 0640 /etc/swift/object-expirer.conf
-fi
diff --git a/docker/swift/swift-object-replicator/config-external.sh b/docker/swift/swift-object-replicator/config-external.sh
deleted file mode 100644
index 8277210881..0000000000
--- a/docker/swift/swift-object-replicator/config-external.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then
- cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz
- chown ${OWNER}: /etc/swift/object.ring.gz
- chmod 0640 /etc/swift/object.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-object-replicator/object-replicator.conf" ]]; then
- cp /opt/kolla/swift-object-replicator/object-replicator.conf /etc/swift/object-replicator.conf
- chown ${OWNER}: /etc/swift/object-replicator.conf
- chmod 0640 /etc/swift/object-replicator.conf
-fi
diff --git a/docker/swift/swift-object-server/config-external.sh b/docker/swift/swift-object-server/config-external.sh
deleted file mode 100644
index a3fb1a2cc5..0000000000
--- a/docker/swift/swift-object-server/config-external.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then
- cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz
- chown ${OWNER}: /etc/swift/object.ring.gz
- chmod 0640 /etc/swift/object.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-object-server/object-server.conf" ]]; then
- cp /opt/kolla/swift-object-server/object-server.conf /etc/swift/object-server.conf
- chown ${OWNER}: /etc/swift/object-server.conf
- chmod 0640 /etc/swift/object-server.conf
-fi
diff --git a/docker/swift/swift-object-updater/config-external.sh b/docker/swift/swift-object-updater/config-external.sh
deleted file mode 100644
index b94844476b..0000000000
--- a/docker/swift/swift-object-updater/config-external.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then
- cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz
- chown ${OWNER}: /etc/swift/object.ring.gz
- chmod 0640 /etc/swift/object.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-object-updater/object-updater.conf" ]]; then
- cp /opt/kolla/swift-object-updater/object-updater.conf /etc/swift/object-updater.conf
- chown ${OWNER}: /etc/swift/object-updater.conf
- chmod 0640 /etc/swift/object-updater.conf
-fi
diff --git a/docker/swift/swift-proxy-server/config-external.sh b/docker/swift/swift-proxy-server/config-external.sh
deleted file mode 100755
index 434cce7e5f..0000000000
--- a/docker/swift/swift-proxy-server/config-external.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift/swift.conf" ]]; then
- cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf
- chown ${OWNER}: /etc/swift/swift.conf
- chmod 0640 /etc/swift/swift.conf
-fi
-
-if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then
- cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz
- chown ${OWNER}: /etc/swift/object.ring.gz
- chmod 0640 /etc/swift/object.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then
- cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz
- chown ${OWNER}: /etc/swift/container.ring.gz
- chmod 0640 /etc/swift/container.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown ${OWNER}: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-proxy-server/proxy-server.conf" ]]; then
- cp /opt/kolla/swift-proxy-server/proxy-server.conf /etc/swift/proxy-server.conf
- chown ${OWNER}: /etc/swift/proxy-server.conf
- chmod 0640 /etc/swift/proxy-server.conf
-fi
diff --git a/docker/swift/swift-rsyncd/config-external.sh b/docker/swift/swift-rsyncd/config-external.sh
deleted file mode 100644
index 3b3104272e..0000000000
--- a/docker/swift/swift-rsyncd/config-external.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-OWNER="swift"
-
-if [[ -f "/opt/kolla/swift-rsyncd/rsyncd.conf" ]]; then
- cp /opt/kolla/swift-rsyncd/rsyncd.conf /etc/rsyncd.conf
- chown ${OWNER}: /etc/rsyncd.conf
- chmod 0640 /etc/rsyncd.conf
-fi
--
GitLab