Repository: stratos Updated Branches: refs/heads/stratos-4.1.x a5a7aba0b -> c5b3f1375
Add MB_URLS, MB_USERNAME, MB_PASSWORD and MB_PUBLISHER_TIMEOUT properties to 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/670f11ac Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/670f11ac Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/670f11ac Branch: refs/heads/stratos-4.1.x Commit: 670f11acb5408338050a793dfd82bcbd2a9a9d79 Parents: a5a7aba Author: Akila Perera <[email protected]> Authored: Wed Nov 18 00:48:25 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Wed Nov 18 00:48:25 2015 +0530 ---------------------------------------------------------------------- .../kubernetes-cluster-1.json | 8 ++----- .../kubernetes-cluster-2.json | 8 ++----- .../kubernetes-cluster-ec2.json | 8 ++----- .../base-image/files/run | 22 +++++++++++++++++--- .../stratos-docker-images/puppetmaster/run | 3 +-- 5 files changed, 26 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/670f11ac/samples/kubernetes-clusters/kubernetes-cluster-1.json ---------------------------------------------------------------------- diff --git a/samples/kubernetes-clusters/kubernetes-cluster-1.json b/samples/kubernetes-clusters/kubernetes-cluster-1.json index be09d5f..6862106 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-1.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-1.json @@ -33,12 +33,8 @@ ], "property": [ { - "name": "payload_parameter.MB_IP", - "value": "172.17.8.1" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "1883" + "name": "payload_parameter.MB_URLS", + "value": "172.17.8.1:1883" }, { "name": "payload_parameter.MB_USERNAME", http://git-wip-us.apache.org/repos/asf/stratos/blob/670f11ac/samples/kubernetes-clusters/kubernetes-cluster-2.json ---------------------------------------------------------------------- diff --git a/samples/kubernetes-clusters/kubernetes-cluster-2.json b/samples/kubernetes-clusters/kubernetes-cluster-2.json index 4107da8..ebc7613 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-2.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-2.json @@ -33,12 +33,8 @@ ], "property": [ { - "name": "payload_parameter.MB_IP", - "value": "172.17.8.1" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "1884" + "name": "payload_parameter.MB_URLS", + "value": "172.17.8.1:1883" }, { "name": "payload_parameter.MB_USERNAME", http://git-wip-us.apache.org/repos/asf/stratos/blob/670f11ac/samples/kubernetes-clusters/kubernetes-cluster-ec2.json ---------------------------------------------------------------------- diff --git a/samples/kubernetes-clusters/kubernetes-cluster-ec2.json b/samples/kubernetes-clusters/kubernetes-cluster-ec2.json index 1f65a53..4a6d936 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-ec2.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-ec2.json @@ -41,12 +41,8 @@ ], "property": [ { - "name": "payload_parameter.MB_IP", - "value": "54.179.197.243" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "1883" + "name": "payload_parameter.MB_URLS", + "value": "54.179.197.243:1883" }, { "name": "payload_parameter.MB_USERNAME", http://git-wip-us.apache.org/repos/asf/stratos/blob/670f11ac/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 936ada1..ff5e9b9 100755 --- a/tools/docker-images/cartridge-docker-images/base-image/files/run +++ b/tools/docker-images/cartridge-docker-images/base-image/files/run @@ -32,9 +32,25 @@ export PCA_HOME="/mnt/apache-stratos-python-cartridge-agent-${STRATOS_VERSION}" set -o posix ; set | sed -e ':a;N;$!ba;s/\n/,/g' > ${PCA_HOME}/payload/launch-params #mandatory parameters -sed -i "s/MB-IP/${MB_IP}/g" ${PCA_HOME}/agent.conf -sed -i "s/MB-PORT/${MB_PORT}/g" ${PCA_HOME}/agent.conf +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 +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/${PASSWORD}/g" ${PCA_HOME}/agent.conf +fi + +if [ -z "${MB_PUBLISHER_TIMEOUT}" ]; then + sed -i "s/MB-PUBLISHER-TIMEOUT/10/g" ${PCA_HOME}/agent.conf +else + sed -i "s/MB-PUBLISHER-TIMEOUT/${MB_PUBLISHER_TIMEOUT}/g" ${PCA_HOME}/agent.conf +fi #parameters that can be empty #default values have to be set @@ -48,7 +64,7 @@ fi # defaults to the message broker IP if not set if [ -z "${CEP_URLS}" ]; then - sed -i "s/CEP-URLS/${MB_IP}:7711/g" ${PCA_HOME}/agent.conf + sed -i "s/CEP-URLS/${MB_URLS}/g" ${PCA_HOME}/agent.conf else sed -i "s/CEP-URLS/${CEP_URLS}/g" ${PCA_HOME}/agent.conf fi http://git-wip-us.apache.org/repos/asf/stratos/blob/670f11ac/tools/docker-images/stratos-docker-images/puppetmaster/run ---------------------------------------------------------------------- diff --git a/tools/docker-images/stratos-docker-images/puppetmaster/run b/tools/docker-images/stratos-docker-images/puppetmaster/run index c3d7f94..83cfe80 100755 --- a/tools/docker-images/stratos-docker-images/puppetmaster/run +++ b/tools/docker-images/stratos-docker-images/puppetmaster/run @@ -51,8 +51,7 @@ sed -i -E "s:(\s*[$]java_name.*=).*$:\1 \"jdk1.7.0_80\":g" $PUPPET_FILE sed -i -E "s:(\s*[$]java_distribution.*=).*$:\1 \"jdk-7u80-linux-x64.tar.gz\":g" $PUPPET_FILE sed -i -E "s:(\s*[$]local_package_dir.*=).*$:\1 \"/mnt/packs\":g" $PUPPET_FILE -sed -i -E "s:(\s*[$]mb_ip.*=).*$:\1 \"$MB_HOSTNAME\":g" $PUPPET_FILE -sed -i -E "s:(\s*[$]mb_port.*=).*$:\1 \"$MB_PORT\":g" $PUPPET_FILE +sed -i -E "s:(\s*[$]mb_url.*=).*$:\1 \"$MB_HOSTNAME:$MB_PORT\":g" $PUPPET_FILE sed -i -E "s:(\s*[$]truststore_password.*=).*$:\1 \"$TRUSTSTORE_PASSWORD\":g" $PUPPET_FILE puppet master --no-daemonize --logdest console
