diff --git a/docker/centos/binary/swift/swift-account-server/Dockerfile b/docker/centos/binary/swift/swift-account-server/Dockerfile index b60a267a8565ab76d7115e6dac83effad9082443..3ceac3a6331f81faf70857b772188cfb80f9d70a 100644 --- a/docker/centos/binary/swift/swift-account-server/Dockerfile +++ b/docker/centos/binary/swift/swift-account-server/Dockerfile @@ -6,6 +6,6 @@ RUN yum -y install \ && yum clean all COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-account-server/config-internal.sh b/docker/centos/binary/swift/swift-account-server/config-internal.sh deleted file mode 120000 index 93174deb0888f038ada0a005698d2c0f3345887c..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-account-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container-server/Dockerfile b/docker/centos/binary/swift/swift-container-server/Dockerfile index e88e1ebcc3378ac70fd8d5fe1c52f4575a5e1db8..c370032d176f50f4a54a4cccbb1f0360c3a5c291 100644 --- a/docker/centos/binary/swift/swift-container-server/Dockerfile +++ b/docker/centos/binary/swift/swift-container-server/Dockerfile @@ -6,6 +6,6 @@ RUN yum -y install \ && yum clean all COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-container-server/config-internal.sh b/docker/centos/binary/swift/swift-container-server/config-internal.sh deleted file mode 120000 index 3b3c7fcdf1938e6f240e4d6cbca61362f6e53cc6..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-container-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-auditor/Dockerfile b/docker/centos/binary/swift/swift-object-auditor/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/binary/swift/swift-object-auditor/Dockerfile +++ b/docker/centos/binary/swift/swift-object-auditor/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-auditor/config-internal.sh b/docker/centos/binary/swift/swift-object-auditor/config-internal.sh deleted file mode 120000 index e3802f38d61b0771c422f12bf1d33ddae4599342..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-object-auditor/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-expirer/Dockerfile b/docker/centos/binary/swift/swift-object-expirer/Dockerfile index d1a79c6ab91536aca6e18802a3c686d3cfc5f78b..3f3b941c728a574907d532e28315675e3557ebba 100644 --- a/docker/centos/binary/swift/swift-object-expirer/Dockerfile +++ b/docker/centos/binary/swift/swift-object-expirer/Dockerfile @@ -7,6 +7,6 @@ RUN yum -y install \ && yum clean all COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-expirer/config-internal.sh b/docker/centos/binary/swift/swift-object-expirer/config-internal.sh deleted file mode 120000 index ebd7f0f3e82cc1556603feeebc0b65c0d560ac02..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-object-expirer/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-replicator/Dockerfile b/docker/centos/binary/swift/swift-object-replicator/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/binary/swift/swift-object-replicator/Dockerfile +++ b/docker/centos/binary/swift/swift-object-replicator/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-replicator/config-internal.sh b/docker/centos/binary/swift/swift-object-replicator/config-internal.sh deleted file mode 120000 index f2a7e134eab04da6050f830753ea0c2f5ba6ee5d..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-object-replicator/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-server/Dockerfile b/docker/centos/binary/swift/swift-object-server/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/binary/swift/swift-object-server/Dockerfile +++ b/docker/centos/binary/swift/swift-object-server/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-server/config-internal.sh b/docker/centos/binary/swift/swift-object-server/config-internal.sh deleted file mode 120000 index 24821e4d2d1ac32ea6ad84cfc085e5d9edf11fc3..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-object-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-updater/Dockerfile b/docker/centos/binary/swift/swift-object-updater/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/binary/swift/swift-object-updater/Dockerfile +++ b/docker/centos/binary/swift/swift-object-updater/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-updater/config-internal.sh b/docker/centos/binary/swift/swift-object-updater/config-internal.sh deleted file mode 120000 index fb1e9bdff3b4af550d1b02bc850d42686f0f2a36..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-object-updater/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/config-internal.sh \ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile index 4f8b27b49163f0f15ca41275ede99dbce2787676..2cc54e9387cf1f89d1eabaeb8035ad94888d9463 100644 --- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile +++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile @@ -5,6 +5,6 @@ RUN yum -y install openstack-swift-proxy && yum clean all COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh deleted file mode 120000 index a33b6be4f4bf29cdade6d1824e2d3b8f8ade4226..0000000000000000000000000000000000000000 --- a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-account-server/Dockerfile b/docker/centos/source/swift/swift-account-server/Dockerfile index fc97fa8d3d340c26e396bd93359f9f6d33a21506..c923e339e6ac3d9c73ac1c411ada6ec86b8e5e77 100644 --- a/docker/centos/source/swift/swift-account-server/Dockerfile +++ b/docker/centos/source/swift/swift-account-server/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-account-server/config-internal.sh b/docker/centos/source/swift/swift-account-server/config-internal.sh deleted file mode 120000 index 93174deb0888f038ada0a005698d2c0f3345887c..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-account-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-container-server/Dockerfile b/docker/centos/source/swift/swift-container-server/Dockerfile index fc97fa8d3d340c26e396bd93359f9f6d33a21506..c923e339e6ac3d9c73ac1c411ada6ec86b8e5e77 100644 --- a/docker/centos/source/swift/swift-container-server/Dockerfile +++ b/docker/centos/source/swift/swift-container-server/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-container-server/config-internal.sh b/docker/centos/source/swift/swift-container-server/config-internal.sh deleted file mode 120000 index 3b3c7fcdf1938e6f240e4d6cbca61362f6e53cc6..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-container-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-auditor/Dockerfile b/docker/centos/source/swift/swift-object-auditor/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/source/swift/swift-object-auditor/Dockerfile +++ b/docker/centos/source/swift/swift-object-auditor/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-auditor/config-internal.sh b/docker/centos/source/swift/swift-object-auditor/config-internal.sh deleted file mode 120000 index e3802f38d61b0771c422f12bf1d33ddae4599342..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-object-auditor/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-expirer/Dockerfile b/docker/centos/source/swift/swift-object-expirer/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/source/swift/swift-object-expirer/Dockerfile +++ b/docker/centos/source/swift/swift-object-expirer/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-expirer/config-internal.sh b/docker/centos/source/swift/swift-object-expirer/config-internal.sh deleted file mode 120000 index ebd7f0f3e82cc1556603feeebc0b65c0d560ac02..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-object-expirer/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-replicator/Dockerfile b/docker/centos/source/swift/swift-object-replicator/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/source/swift/swift-object-replicator/Dockerfile +++ b/docker/centos/source/swift/swift-object-replicator/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-replicator/config-internal.sh b/docker/centos/source/swift/swift-object-replicator/config-internal.sh deleted file mode 120000 index f2a7e134eab04da6050f830753ea0c2f5ba6ee5d..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-object-replicator/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-server/Dockerfile b/docker/centos/source/swift/swift-object-server/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/source/swift/swift-object-server/Dockerfile +++ b/docker/centos/source/swift/swift-object-server/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-server/config-internal.sh b/docker/centos/source/swift/swift-object-server/config-internal.sh deleted file mode 120000 index 24821e4d2d1ac32ea6ad84cfc085e5d9edf11fc3..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-object-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-updater/Dockerfile b/docker/centos/source/swift/swift-object-updater/Dockerfile index 9cbbd53c0e0c14fd8ceda80d6ea039191c00edce..eb070cce94e9db96443b19bf8e1dd5a1ced9f009 100644 --- a/docker/centos/source/swift/swift-object-updater/Dockerfile +++ b/docker/centos/source/swift/swift-object-updater/Dockerfile @@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-updater/config-internal.sh b/docker/centos/source/swift/swift-object-updater/config-internal.sh deleted file mode 120000 index fb1e9bdff3b4af550d1b02bc850d42686f0f2a36..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-object-updater/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/config-internal.sh \ No newline at end of file diff --git a/docker/centos/source/swift/swift-proxy-server/Dockerfile b/docker/centos/source/swift/swift-proxy-server/Dockerfile index 737ae80e071f1bd4ac3f5af2aad9e69f5f5f8d96..cbd4357f31714cbc1242686ad48856397625e983 100644 --- a/docker/centos/source/swift/swift-proxy-server/Dockerfile +++ b/docker/centos/source/swift/swift-proxy-server/Dockerfile @@ -3,6 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh /start.sh -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-proxy-server/config-internal.sh b/docker/centos/source/swift/swift-proxy-server/config-internal.sh deleted file mode 120000 index a33b6be4f4bf29cdade6d1824e2d3b8f8ade4226..0000000000000000000000000000000000000000 --- a/docker/centos/source/swift/swift-proxy-server/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/config-internal.sh \ No newline at end of file diff --git a/docker/common/swift/swift-account-server/config-internal.sh b/docker/common/swift/swift-account-server/config-internal.sh deleted file mode 100755 index 461020fd08bade81e1deefeb6af2c3d8f2c7694b..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-account-server/config-internal.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-account-server" -ARGS="/etc/swift/account-server.conf --verbose" - -. /opt/kolla/config-swift.sh - -check_required_vars \ - SWIFT_ACCOUNT_SVC_BIND_IP \ - SWIFT_ACCOUNT_SVC_BIND_PORT \ - SWIFT_ACCOUNT_SVC_DEVICES \ - SWIFT_ACCOUNT_SVC_MOUNT_CHECK \ - SWIFT_ACCOUNT_SVC_RING_DEVICES \ - SWIFT_ACCOUNT_SVC_RING_HOSTS \ - SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS \ - SWIFT_ACCOUNT_SVC_RING_NAME \ - SWIFT_ACCOUNT_SVC_RING_PART_POWER \ - SWIFT_ACCOUNT_SVC_RING_REPLICAS \ - SWIFT_ACCOUNT_SVC_RING_WEIGHTS \ - SWIFT_ACCOUNT_SVC_RING_ZONES \ - SWIFT_DIR \ - SWIFT_USER - -exec $CMD $ARGS - -cfg=/etc/swift/account-server.conf - -# [DEFAULT] -crudini --set $cfg DEFAULT bind_ip "${SWIFT_ACCOUNT_SVC_BIND_IP}" -crudini --set $cfg DEFAULT bind_port "${SWIFT_ACCOUNT_SVC_BIND_PORT}" -crudini --set $cfg DEFAULT user "${SWIFT_USER}" -crudini --set $cfg DEFAULT swift_dir "${SWIFT_DIR}" -crudini --set $cfg DEFAULT devices "${SWIFT_ACCOUNT_SVC_DEVICES}" -crudini --set $cfg DEFAULT mount_check "${SWIFT_ACCOUNT_SVC_MOUNT_CHECK}" - -# Create swift user and group if they don't exist -id -u swift &>/dev/null || useradd --user-group swift - -# Ensure proper ownership of the mount point directory structure -chown -R swift:swift /srv/node - -python /opt/kolla/build-swift-ring.py \ - -f ${SWIFT_ACCOUNT_SVC_RING_NAME} \ - -p ${SWIFT_ACCOUNT_SVC_RING_PART_POWER} \ - -r ${SWIFT_ACCOUNT_SVC_RING_REPLICAS} \ - -m ${SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS} \ - -H ${SWIFT_ACCOUNT_SVC_RING_HOSTS} \ - -w ${SWIFT_ACCOUNT_SVC_RING_WEIGHTS} \ - -d ${SWIFT_ACCOUNT_SVC_RING_DEVICES} \ - -z ${SWIFT_ACCOUNT_SVC_RING_ZONES} - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-account-server/start.sh b/docker/common/swift/swift-account-server/start.sh index 96ce90d0728b3deae832f5ef62cfdd569b596f58..1c205cb26f83f87a53ac156ba271806c8f9e1ff2 100755 --- a/docker/common/swift/swift-account-server/start.sh +++ b/docker/common/swift/swift-account-server/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/account-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/swift/swift-container-server/config-internal.sh b/docker/common/swift/swift-container-server/config-internal.sh deleted file mode 100755 index 5404baea2ad939eb48b4db1f7ec690e38f0f5803..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-container-server/config-internal.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-container-server" -ARGS="/etc/swift/container-server.conf --verbose" - -. /opt/kolla/config-swift.sh - -check_required_vars \ - SWIFT_CONTAINER_SVC_BIND_IP \ - SWIFT_CONTAINER_SVC_BIND_PORT \ - SWIFT_CONTAINER_SVC_DEVICES \ - SWIFT_CONTAINER_SVC_MOUNT_CHECK \ - SWIFT_CONTAINER_SVC_RING_DEVICES \ - SWIFT_CONTAINER_SVC_RING_HOSTS \ - SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS \ - SWIFT_CONTAINER_SVC_RING_NAME \ - SWIFT_CONTAINER_SVC_RING_PART_POWER \ - SWIFT_CONTAINER_SVC_RING_REPLICAS \ - SWIFT_CONTAINER_SVC_RING_WEIGHTS \ - SWIFT_CONTAINER_SVC_RING_ZONES \ - SWIFT_DIR \ - SWIFT_USER - -cfg=/etc/swift/container-server.conf - -# [DEFAULT] -crudini --set $cfg DEFAULT bind_ip "${SWIFT_CONTAINER_SVC_BIND_IP}" -crudini --set $cfg DEFAULT bind_port "${SWIFT_CONTAINER_SVC_BIND_PORT}" -crudini --set $cfg DEFAULT user "${SWIFT_USER}" -crudini --set $cfg DEFAULT swift_dir "${SWIFT_DIR}" -crudini --set $cfg DEFAULT devices "${SWIFT_CONTAINER_SVC_DEVICES}" -crudini --set $cfg DEFAULT mount_check "${SWIFT_CONTAINER_SVC_MOUNT_CHECK}" - -# Create swift user and group if they don't exist -id -u swift &>/dev/null || useradd --user-group swift - -# Ensure proper ownership of the mount point directory structure -chown -R swift:swift /srv/node - -python /opt/kolla/build-swift-ring.py \ - -f ${SWIFT_CONTAINER_SVC_RING_NAME} \ - -p ${SWIFT_CONTAINER_SVC_RING_PART_POWER} \ - -r ${SWIFT_CONTAINER_SVC_RING_REPLICAS} \ - -m ${SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS} \ - -H ${SWIFT_CONTAINER_SVC_RING_HOSTS} \ - -w ${SWIFT_CONTAINER_SVC_RING_WEIGHTS} \ - -d ${SWIFT_CONTAINER_SVC_RING_DEVICES} \ - -z ${SWIFT_CONTAINER_SVC_RING_ZONES} - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-container-server/start.sh b/docker/common/swift/swift-container-server/start.sh index 40ec9396053700f180e3f9a668e1e10d15478a47..2c8977d50b2c4f804964bd19f470aa73be40b03d 100755 --- a/docker/common/swift/swift-container-server/start.sh +++ b/docker/common/swift/swift-container-server/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/container-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-auditor/config-internal.sh b/docker/common/swift/swift-object-auditor/config-internal.sh deleted file mode 100755 index 8d3a198530bcbbd53655e7fa31425c94f6cf34a7..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-object-auditor/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-object-auditor" -ARGS="/etc/swift/object-server.conf --verbose" - -. /opt/kolla/config-swift.sh -. /opt/kolla/config-swift-object.sh - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-auditor/start.sh b/docker/common/swift/swift-object-auditor/start.sh index ea587cfadf84bbf710cbe0eb8743817b9d1eec4d..18978e703eb6f922237f11e98085eca230eab9a3 100755 --- a/docker/common/swift/swift-object-auditor/start.sh +++ b/docker/common/swift/swift-object-auditor/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/object-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-expirer/config-internal.sh b/docker/common/swift/swift-object-expirer/config-internal.sh deleted file mode 100755 index 8b3cac0dc5bc25dde6266d585dfd1c60139dddcd..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-object-expirer/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-object-expirer" -ARGS="/etc/swift/object-server.conf --verbose" - -. /opt/kolla/config-swift.sh -. /opt/kolla/config-swift-object.sh - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-expirer/start.sh b/docker/common/swift/swift-object-expirer/start.sh index e4cfa736944a8b7025780a23885525d99266cd61..3d073fcc21a3ed8940ee020fb990905c7ce374e2 100755 --- a/docker/common/swift/swift-object-expirer/start.sh +++ b/docker/common/swift/swift-object-expirer/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/object-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-replicator/config-internal.sh b/docker/common/swift/swift-object-replicator/config-internal.sh deleted file mode 100755 index 101fa90f80d7966f25615a2e65796bace37bd635..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-object-replicator/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-object-replicator" -ARGS="/etc/swift/object-server.conf --verbose" - -. /opt/kolla/config-swift.sh -. /opt/kolla/config-swift-object.sh - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-replicator/start.sh b/docker/common/swift/swift-object-replicator/start.sh index e6049717a42d702d9e3c42b6459661032800464d..409661c6fadbe086a01c2a00518f4e5a79dadbd3 100755 --- a/docker/common/swift/swift-object-replicator/start.sh +++ b/docker/common/swift/swift-object-replicator/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/object-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-server/config-internal.sh b/docker/common/swift/swift-object-server/config-internal.sh deleted file mode 100755 index fbee943836454eb0bbe7b9328e33c9a66f4fb1b3..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-object-server/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-object-server" -ARGS="/etc/swift/object-server.conf --verbose" - -. /opt/kolla/config-swift.sh -. /opt/kolla/config-swift-object.sh - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-server/start.sh b/docker/common/swift/swift-object-server/start.sh index 7b9f022f2948796834e540a7e6fc2b87677117d2..c5def0a7a099a23c58a8a8f5a19dbb2294c82aba 100755 --- a/docker/common/swift/swift-object-server/start.sh +++ b/docker/common/swift/swift-object-server/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/object-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-updater/config-internal.sh b/docker/common/swift/swift-object-updater/config-internal.sh deleted file mode 100755 index accaea6c7f88066d0c259e556140b4111ddc17ef..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-object-updater/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-object-updater" -ARGS="/etc/swift/object-server.conf --verbose" - -. /opt/kolla/config-swift.sh -. /opt/kolla/config-swift-object.sh - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-object-updater/start.sh b/docker/common/swift/swift-object-updater/start.sh index e3b111e79bea1ff7b5e2e20f28ee3910785bb07c..d2648582487dbf1efcf9373f3abd8ed632048566 100755 --- a/docker/common/swift/swift-object-updater/start.sh +++ b/docker/common/swift/swift-object-updater/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/object-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/swift/swift-proxy-server/config-internal.sh b/docker/common/swift/swift-proxy-server/config-internal.sh deleted file mode 100755 index 436d1fbba61390eb3758fd835d13a1a71c36c48d..0000000000000000000000000000000000000000 --- a/docker/common/swift/swift-proxy-server/config-internal.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/bash - -set -e - -CMD="/usr/bin/swift-proxy-server" -ARGS="/etc/swift/proxy-server.conf --verbose" - -. /opt/kolla/config-swift.sh - -check_required_vars \ - SWIFT_ACCOUNT_SVC_RING_DEVICES \ - SWIFT_ACCOUNT_SVC_RING_HOSTS \ - SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS \ - SWIFT_ACCOUNT_SVC_RING_NAME \ - SWIFT_ACCOUNT_SVC_RING_PART_POWER \ - SWIFT_ACCOUNT_SVC_RING_REPLICAS \ - SWIFT_ACCOUNT_SVC_RING_WEIGHTS \ - SWIFT_ACCOUNT_SVC_RING_ZONES \ - SWIFT_ADMIN_USER \ - SWIFT_CONTAINER_SVC_RING_DEVICES \ - SWIFT_CONTAINER_SVC_RING_HOSTS \ - SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS \ - SWIFT_CONTAINER_SVC_RING_NAME \ - SWIFT_CONTAINER_SVC_RING_PART_POWER \ - SWIFT_CONTAINER_SVC_RING_REPLICAS \ - SWIFT_CONTAINER_SVC_RING_WEIGHTS \ - SWIFT_CONTAINER_SVC_RING_ZONES \ - SWIFT_KEYSTONE_PASSWORD \ - SWIFT_KEYSTONE_USER \ - SWIFT_OBJECT_SVC_RING_DEVICES \ - SWIFT_OBJECT_SVC_RING_HOSTS \ - SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS \ - SWIFT_OBJECT_SVC_RING_NAME \ - SWIFT_OBJECT_SVC_RING_PART_POWER \ - SWIFT_OBJECT_SVC_RING_REPLICAS \ - SWIFT_OBJECT_SVC_RING_WEIGHTS \ - SWIFT_OBJECT_SVC_RING_ZONES \ - SWIFT_PROXY_ACCOUNT_AUTOCREATE \ - SWIFT_PROXY_AUTH_PLUGIN \ - SWIFT_PROXY_BIND_IP \ - SWIFT_PROXY_BIND_PORT \ - SWIFT_PROXY_DELAY_AUTH_DECISION \ - SWIFT_PROXY_DIR \ - SWIFT_PROXY_OPERATOR_ROLES \ - SWIFT_PROXY_PASSWORD \ - SWIFT_PROXY_PIPELINE_MAIN \ - SWIFT_PROXY_PROJECT_DOMAIN_ID \ - SWIFT_PROXY_PROJECT_NAME \ - SWIFT_PROXY_SIGNING_DIR \ - SWIFT_PROXY_USER_DOMAIN_ID \ - SWIFT_PROXY_USERNAME \ - SWIFT_USER - -export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" - -crux user-create --update \ - -n "${SWIFT_KEYSTONE_USER}" \ - -p "${SWIFT_KEYSTONE_PASSWORD}" \ - -t "${ADMIN_TENANT_NAME}" \ - -r admin - -crux endpoint-create --remove-all \ - -n swift -t object-store \ - -I "http://${SWIFT_API_SERVICE_HOST}:8080/v1/AUTH_%(tenant_id)s'" \ - -P "http://${PUBLIC_IP}:8080/v1/AUTH_%(tenant_id)s" \ - -A "http://${SWIFT_API_SERVICE_HOST}:8080'" - -cfg=/etc/swift/proxy-server.conf - -crudini --set $cfg DEFAULT bind_port "${SWIFT_PROXY_BIND_PORT}" -crudini --set $cfg DEFAULT user "${SWIFT_USER}" -crudini --set $cfg DEFAULT swift_dir "${SWIFT_PROXY_DIR}" -crudini --set $cfg DEFAULT bind_ip "${SWIFT_PROXY_BIND_IP}" - -crudini --set $cfg pipeline:main pipeline "${SWIFT_PROXY_PIPELINE_MAIN}" - -crudini --set $cfg app:proxy-server account_autocreate "${SWIFT_PROXY_ACCOUNT_AUTOCREATE}" - -crudini --del $cfg filter:keystone -crudini --set $cfg filter:keystoneauth use egg:swift#keystoneauth -crudini --set $cfg filter:keystoneauth operator_roles "${SWIFT_PROXY_OPERATOR_ROLES}" - -crudini --set $cfg filter:container_sync use egg:swift#container_sync - -crudini --set $cfg filter:bulk use egg:swift#bulk - -crudini --set $cfg filter:ratelimit use egg:swift#ratelimit - -crudini --set $cfg filter:authtoken auth_uri \ - "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/" -crudini --set $cfg filter:authtoken auth_url \ - "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/" -crudini --set $cfg filter:authtoken auth_host "${KEYSTONE_PUBLIC_SERVICE_HOST}" -crudini --set $cfg filter:authtoken auth_port "${KEYSTONE_ADMIN_SERVICE_PORT}" -crudini --set $cfg filter:authtoken admin_tenant_name "${ADMIN_TENANT_NAME}" -crudini --set $cfg filter:authtoken admin_user "${SWIFT_KEYSTONE_USER}" -crudini --set $cfg filter:authtoken admin_password "${SWIFT_KEYSTONE_PASSWORD}" -crudini --set $cfg filter:authtoken delay_auth_decision "${SWIFT_PROXY_DELAY_AUTH_DECISION}" -crudini --set $cfg filter:authtoken signing_dir "${SWIFT_PROXY_SIGNING_DIR}" - -crudini --set $cfg filter:cache memcache_servers "${PUBLIC_IP}:11211" - -crudini --set $cfg filter:gatekeeper use egg:swift#gatekeeper - -crudini --set $cfg filter:slo use egg:swift#slo - -crudini --set $cfg filter:dlo use egg:swift#dlo - -# Create swift user and group if they don't exist -id -u swift &>/dev/null || useradd --user-group swift - -# TODO(pbourke): should these go into the Dockerfile instead? -# TODO(pbourke): do we need a data vol for these? -mkdir -p ${SWIFT_PROXY_SIGNING_DIR} -chown swift: ${SWIFT_PROXY_SIGNING_DIR} -chmod 0700 ${SWIFT_PROXY_SIGNING_DIR} - -python /opt/kolla/build-swift-ring.py \ - -f ${SWIFT_OBJECT_SVC_RING_NAME} \ - -p ${SWIFT_OBJECT_SVC_RING_PART_POWER} \ - -r ${SWIFT_OBJECT_SVC_RING_REPLICAS} \ - -m ${SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS} \ - -H ${SWIFT_OBJECT_SVC_RING_HOSTS} \ - -w ${SWIFT_OBJECT_SVC_RING_WEIGHTS} \ - -d ${SWIFT_OBJECT_SVC_RING_DEVICES} \ - -z ${SWIFT_OBJECT_SVC_RING_ZONES} - -python /opt/kolla/build-swift-ring.py \ - -f ${SWIFT_ACCOUNT_SVC_RING_NAME} \ - -p ${SWIFT_ACCOUNT_SVC_RING_PART_POWER} \ - -r ${SWIFT_ACCOUNT_SVC_RING_REPLICAS} \ - -m ${SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS} \ - -H ${SWIFT_ACCOUNT_SVC_RING_HOSTS} \ - -w ${SWIFT_ACCOUNT_SVC_RING_WEIGHTS} \ - -d ${SWIFT_ACCOUNT_SVC_RING_DEVICES} \ - -z ${SWIFT_ACCOUNT_SVC_RING_ZONES} - -python /opt/kolla/build-swift-ring.py \ - -f ${SWIFT_CONTAINER_SVC_RING_NAME} \ - -p ${SWIFT_CONTAINER_SVC_RING_PART_POWER} \ - -r ${SWIFT_CONTAINER_SVC_RING_REPLICAS} \ - -m ${SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS} \ - -H ${SWIFT_CONTAINER_SVC_RING_HOSTS} \ - -w ${SWIFT_CONTAINER_SVC_RING_WEIGHTS} \ - -d ${SWIFT_CONTAINER_SVC_RING_DEVICES} \ - -z ${SWIFT_CONTAINER_SVC_RING_ZONES} - -exec $CMD $ARGS diff --git a/docker/common/swift/swift-proxy-server/start.sh b/docker/common/swift/swift-proxy-server/start.sh index c1b5b29cdb8c3043d83be55e5dddf4085c3e2c25..da8bd088d0b2378b07522c6896ade97d404bd44e 100755 --- a/docker/common/swift/swift-proxy-server/start.sh +++ b/docker/common/swift/swift-proxy-server/start.sh @@ -8,7 +8,7 @@ ARGS="/etc/swift/proxy-server.conf --verbose" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md index f33e5a3c48a9edf40767442b66177fd58c36dc92..3b97e461a39e2ddcb2f9e0ab79a2e45ef5f7db27 100644 --- a/docs/minimal-environment-vars.md +++ b/docs/minimal-environment-vars.md @@ -516,20 +516,7 @@ In order for each service to function, there is a minimum set of required variab # Swift-account-server - SWIFT_ACCOUNT_SVC_BIND_IP - SWIFT_ACCOUNT_SVC_BIND_PORT - SWIFT_ACCOUNT_SVC_DEVICES - SWIFT_ACCOUNT_SVC_MOUNT_CHECK - SWIFT_ACCOUNT_SVC_RING_DEVICES - SWIFT_ACCOUNT_SVC_RING_HOSTS - SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS - SWIFT_ACCOUNT_SVC_RING_NAME - SWIFT_ACCOUNT_SVC_RING_PART_POWER - SWIFT_ACCOUNT_SVC_RING_REPLICAS - SWIFT_ACCOUNT_SVC_RING_WEIGHTS - SWIFT_ACCOUNT_SVC_RING_ZONES - SWIFT_DIR - SWIFT_USER + None # Swift-base @@ -537,20 +524,7 @@ In order for each service to function, there is a minimum set of required variab # Swift-container-server - SWIFT_CONTAINER_SVC_BIND_IP - SWIFT_CONTAINER_SVC_BIND_PORT - SWIFT_CONTAINER_SVC_DEVICES - SWIFT_CONTAINER_SVC_MOUNT_CHECK - SWIFT_CONTAINER_SVC_RING_DEVICES - SWIFT_CONTAINER_SVC_RING_HOSTS - SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS - SWIFT_CONTAINER_SVC_RING_NAME - SWIFT_CONTAINER_SVC_RING_PART_POWER - SWIFT_CONTAINER_SVC_RING_REPLICAS - SWIFT_CONTAINER_SVC_RING_WEIGHTS - SWIFT_CONTAINER_SVC_RING_ZONES - SWIFT_DIR - SWIFT_USER + None # Swift-object-auditor @@ -600,48 +574,7 @@ In order for each service to function, there is a minimum set of required variab # Swift-proxy-server - SWIFT_ACCOUNT_SVC_RING_DEVICES - SWIFT_ACCOUNT_SVC_RING_HOSTS - SWIFT_ACCOUNT_SVC_RING_MIN_PART_HOURS - SWIFT_ACCOUNT_SVC_RING_NAME - SWIFT_ACCOUNT_SVC_RING_PART_POWER - SWIFT_ACCOUNT_SVC_RING_REPLICAS - SWIFT_ACCOUNT_SVC_RING_WEIGHTS - SWIFT_ACCOUNT_SVC_RING_ZONES - SWIFT_ADMIN_USER - SWIFT_CONTAINER_SVC_RING_DEVICES - SWIFT_CONTAINER_SVC_RING_HOSTS - SWIFT_CONTAINER_SVC_RING_MIN_PART_HOURS - SWIFT_CONTAINER_SVC_RING_NAME - SWIFT_CONTAINER_SVC_RING_PART_POWER - SWIFT_CONTAINER_SVC_RING_REPLICAS - SWIFT_CONTAINER_SVC_RING_WEIGHTS - SWIFT_CONTAINER_SVC_RING_ZONES - SWIFT_KEYSTONE_PASSWORD - SWIFT_KEYSTONE_USER - SWIFT_OBJECT_SVC_RING_DEVICES - SWIFT_OBJECT_SVC_RING_HOSTS - SWIFT_OBJECT_SVC_RING_MIN_PART_HOURS - SWIFT_OBJECT_SVC_RING_NAME - SWIFT_OBJECT_SVC_RING_PART_POWER - SWIFT_OBJECT_SVC_RING_REPLICAS - SWIFT_OBJECT_SVC_RING_WEIGHTS - SWIFT_OBJECT_SVC_RING_ZONES - SWIFT_PROXY_ACCOUNT_AUTOCREATE - SWIFT_PROXY_AUTH_PLUGIN - SWIFT_PROXY_BIND_IP - SWIFT_PROXY_BIND_PORT - SWIFT_PROXY_DELAY_AUTH_DECISION - SWIFT_PROXY_DIR - SWIFT_PROXY_OPERATOR_ROLES - SWIFT_PROXY_PASSWORD - SWIFT_PROXY_PIPELINE_MAIN - SWIFT_PROXY_PROJECT_DOMAIN_ID - SWIFT_PROXY_PROJECT_NAME - SWIFT_PROXY_SIGNING_DIR - SWIFT_PROXY_USERNAME - SWIFT_PROXY_USER_DOMAIN_ID - SWIFT_USER + None # Zaqar