aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-25 13:00:55 +0000
committerSam Yaple <sam@yaple.net>2015-09-25 13:00:55 +0000
commite2e0fd288f52b62bbd0fda75a79261c4c2b8b51e (patch)
tree19936103d227a0321ab5bb81f587fed6e1384508 /docker/swift
parent3d81353706d262b673193d9ba44163917cc21636 (diff)
downloadkolla-e2e0fd288f52b62bbd0fda75a79261c4c2b8b51e.tar.gz
kolla-e2e0fd288f52b62bbd0fda75a79261c4c2b8b51e.zip
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
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-account-auditor/config-external.sh19
-rw-r--r--docker/swift/swift-account-reaper/config-external.sh19
-rw-r--r--docker/swift/swift-account-replicator/config-external.sh19
-rw-r--r--docker/swift/swift-account-server/config-external.sh19
-rw-r--r--docker/swift/swift-container-auditor/config-external.sh21
-rw-r--r--docker/swift/swift-container-replicator/config-external.sh21
-rw-r--r--docker/swift/swift-container-server/config-external.sh21
-rw-r--r--docker/swift/swift-container-updater/config-external.sh27
-rw-r--r--docker/swift/swift-object-auditor/config-external.sh27
-rw-r--r--docker/swift/swift-object-expirer/config-external.sh33
-rw-r--r--docker/swift/swift-object-replicator/config-external.sh27
-rw-r--r--docker/swift/swift-object-server/config-external.sh27
-rw-r--r--docker/swift/swift-object-updater/config-external.sh27
-rwxr-xr-xdocker/swift/swift-proxy-server/config-external.sh33
-rw-r--r--docker/swift/swift-rsyncd/config-external.sh9
15 files changed, 0 insertions, 349 deletions
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 955d75341..000000000
--- 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 dc2055ab3..000000000
--- 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 062c524f2..000000000
--- 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 61adefcd0..000000000
--- 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 e01cc12ae..000000000
--- 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 439d4ae97..000000000
--- 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 d81ba6cc4..000000000
--- 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 ea2d3b781..000000000
--- 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 02be86bfd..000000000
--- 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 51fe26618..000000000
--- 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 827721088..000000000
--- 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 a3fb1a2cc..000000000
--- 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 b94844476..000000000
--- 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 434cce7e5..000000000
--- 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 3b3104272..000000000
--- 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