diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-07 17:44:01 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-07 17:44:01 +0000 |
| commit | 1a145d8a010d05762a0101bb96517eeb5cb52e29 (patch) | |
| tree | 6b6ec7ff9a2de93e76a0c6a4a411f6b3dfe7dc15 /docker/common | |
| parent | a5e907a8e91bc4e1d8f563dc79db0ee96c15d380 (diff) | |
| download | kolla-1a145d8a010d05762a0101bb96517eeb5cb52e29.tar.gz kolla-1a145d8a010d05762a0101bb96517eeb5cb52e29.zip | |
Remove config-internal for rabbitmq
Change-Id: Ifd8fc361d8a7e278134f671910e8c122c9842386
Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common')
| -rwxr-xr-x | docker/common/rabbitmq/config-internal.sh | 11 | ||||
| -rw-r--r-- | docker/common/rabbitmq/config-rabbit.sh | 50 | ||||
| -rw-r--r-- | docker/common/rabbitmq/rabbitmq-env.conf | 2 | ||||
| -rw-r--r-- | docker/common/rabbitmq/rabbitmq.config | 12 |
4 files changed, 0 insertions, 75 deletions
diff --git a/docker/common/rabbitmq/config-internal.sh b/docker/common/rabbitmq/config-internal.sh deleted file mode 100755 index b34a4fa59..000000000 --- a/docker/common/rabbitmq/config-internal.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-rabbit.sh - -check_required_vars RABBITMQ_PASS \ - RABBITMQ_USER - -configure_rabbit - -exec /usr/sbin/rabbitmq-server diff --git a/docker/common/rabbitmq/config-rabbit.sh b/docker/common/rabbitmq/config-rabbit.sh index f14d796ad..6f2283c67 100644 --- a/docker/common/rabbitmq/config-rabbit.sh +++ b/docker/common/rabbitmq/config-rabbit.sh @@ -1,57 +1,7 @@ #!/bin/bash -RABBITMQ_CLUSTER_CONFIGURATION="" - -function configure_files { - sed -i ' - s|@RABBITMQ_USER@|'"$RABBITMQ_USER"'|g - s|@RABBITMQ_PASS@|'"$RABBITMQ_PASS"'|g - s|@RABBITMQ_CLUSTER_CONFIGURATION@|'"$RABBITMQ_CLUSTER_CONFIGURATION"'|g - ' /etc/rabbitmq/rabbitmq.config - - sed -i ' - s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g - ' /etc/rabbitmq/rabbitmq-env.conf -} - function set_rabbitmq_cookie { echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie chown rabbitmq: /var/lib/rabbitmq/.erlang.cookie chmod 400 /var/lib/rabbitmq/.erlang.cookie } - -function configure_cluster { - check_required_vars RABBITMQ_CLUSTER_COOKIE \ - RABBITMQ_CLUSTER_NODES - set_rabbitmq_cookie - - HOSTNAME="" - IP_ADDRESS="" - DELIMETER="" - - for node in ${RABBITMQ_CLUSTER_NODES}; do - HOSTNAME=`echo ${node} | cut -d'@' -f1` - IP_ADDRESS=`echo ${node} | cut -d'@' -f2` - CLUSTER_NODES="${CLUSTER_NODES}${DELIMETER}rabbit@${HOSTNAME}" - echo "${IP_ADDRESS} ${HOSTNAME}" >> /etc/hosts - DELIMETER="," - done - RABBITMQ_CLUSTER_CONFIGURATION="{cluster_nodes, {[$CLUSTER_NODES], disc}}," -} - -function configure_rabbit { - if [ "$RABBITMQ_CLUSTER_NODES" ] && [ "$RABBITMQ_CLUSTER_COOKIE" ]; then - configure_cluster - elif [ "$RABBITMQ_SERVICE_HOST" ]; then - # work around: - # https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/653405 - HOSTNAME=`/usr/bin/hostname -s 2> /dev/null || /bin/hostname 2> /dev/null` - echo "${RABBITMQ_SERVICE_HOST} ${HOSTNAME}" > /etc/hosts - else - echo "You need RABBITMQ_SERVICE_HOST or RABBITMQ_CLUSTER_NODES & " \ - " RABBITMQ_CLUSTER_COOKIES variables" - exit 1 - fi - - configure_files -} diff --git a/docker/common/rabbitmq/rabbitmq-env.conf b/docker/common/rabbitmq/rabbitmq-env.conf deleted file mode 100644 index a8926619c..000000000 --- a/docker/common/rabbitmq/rabbitmq-env.conf +++ /dev/null @@ -1,2 +0,0 @@ -RABBITMQ_NODENAME=rabbit -RABBITMQ_LOG_BASE=@RABBITMQ_LOG_BASE@ diff --git a/docker/common/rabbitmq/rabbitmq.config b/docker/common/rabbitmq/rabbitmq.config deleted file mode 100644 index 7cd0f6829..000000000 --- a/docker/common/rabbitmq/rabbitmq.config +++ /dev/null @@ -1,12 +0,0 @@ -[ - {rabbit, [ - @RABBITMQ_CLUSTER_CONFIGURATION@ - {default_user, <<"@RABBITMQ_USER@">>}, - {default_pass, <<"@RABBITMQ_PASS@">>} - ]}, - {kernel, [ - - ]} -]. -% EOF - |
