Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 28dfc07f5 -> 8f8ac2cfc
Remove redundant config for MB_USERNAME and MB_PASSWORD in K8s run script Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8f8ac2cf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8f8ac2cf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8f8ac2cf Branch: refs/heads/stratos-4.1.x Commit: 8f8ac2cfcb8057f0ff716825ff6beb0cf91ece09 Parents: 55add58 Author: Akila Perera <[email protected]> Authored: Thu Nov 19 14:42:13 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Thu Nov 19 14:43:31 2015 +0530 ---------------------------------------------------------------------- .../cartridge-docker-images/base-image/files/run | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8f8ac2cf/tools/docker-images/cartridge-docker-images/base-image/files/run ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/base-image/files/run b/tools/docker-images/cartridge-docker-images/base-image/files/run index ff5e9b9..ebbd34f 100755 --- a/tools/docker-images/cartridge-docker-images/base-image/files/run +++ b/tools/docker-images/cartridge-docker-images/base-image/files/run @@ -35,15 +35,15 @@ set -o posix ; set | sed -e ':a;N;$!ba;s/\n/,/g' > ${PCA_HOME}/payload/launch-pa sed -i "s/MB-URLS/${MB_URLS}/g" ${PCA_HOME}/agent.conf if [ -z "${MB_USERNAME}" ]; then - sed -i "s/MB-USERNAME//g" ${PCA_HOME}/agent.conf + sed -i "s/MB-USERNAME/ /g" ${PCA_HOME}/agent.conf else sed -i "s/MB-USERNAME/${MB_USERNAME}/g" ${PCA_HOME}/agent.conf fi if [ -z "${MB_PASSWORD}" ]; then - sed -i "s/MB-PASSWORD//g" ${PCA_HOME}/agent.conf + sed -i "s/MB-PASSWORD/ /g" ${PCA_HOME}/agent.conf else - sed -i "s/MB-PASSWORD/${PASSWORD}/g" ${PCA_HOME}/agent.conf + sed -i "s/MB-PASSWORD/${MB_PASSWORD}/g" ${PCA_HOME}/agent.conf fi if [ -z "${MB_PUBLISHER_TIMEOUT}" ]; then @@ -202,18 +202,6 @@ else sed -i "s/LOG_LEVEL/${LOG_LEVEL}/g" ${PCA_HOME}/logging.ini fi -if [ -z "${MB_USERNAME}" ]; then - sed -i "s/MB-USERNAME/ /g" ${PCA_HOME}/agent.conf -else - sed -i "s#MB-USERNAME#${MB_USERNAME}#g" ${PCA_HOME}/agent.conf -fi - -if [ -z "${MB_PASSWORD}" ]; then - sed -i "s/MB-PASSWORD/ /g" ${PCA_HOME}/agent.conf -else - sed -i "s#MB-PASSWORD#${MB_PASSWORD}#g" ${PCA_HOME}/agent.conf -fi - # copy custom plugins to PCA cp -R /mnt/plugins ${PCA_HOME}/
