Fix CEP_URLs in samples and K8s run.sh script
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e33c3c93 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e33c3c93 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e33c3c93 Branch: refs/heads/stratos-4.1.x Commit: e33c3c936bf67ee3a9980d59b592c740fabef47a Parents: fe42059 Author: Akila Perera <[email protected]> Authored: Sun Sep 20 11:10:58 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Sun Sep 20 11:10:58 2015 +0530 ---------------------------------------------------------------------- .../kubernetes-cluster-1.json | 108 ++++++++-------- .../kubernetes-cluster-2.json | 108 ++++++++-------- .../kubernetes-cluster-ec2.json | 124 +++++++++---------- .../base-image/files/run | 13 +- 4 files changed, 167 insertions(+), 186 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e33c3c93/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 399ba83..ee8f3a1 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-1.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-1.json @@ -1,60 +1,56 @@ { - "clusterId": "kubernetes-cluster-1", - "description": "Kubernetes Cluster 1", - "kubernetesMaster": { - "hostId": "master", - "hostname": "master.dev.kubernetes.org", - "privateIPAddress": "172.17.8.101", - "publicIPAddress": "172.17.8.101", - "property": [ - ] - }, - "portRange": { - "upper": "32767", - "lower": "30000" - }, - "kubernetesHosts": [ - { - "hostId": "minion-1", - "hostname": "minion-1.dev.kubernetes.org", - "privateIPAddress": "172.17.8.102", - "publicIPAddress": "172.17.8.102", - "property": [ - ] - }, - { - "hostId": "minion-2", - "hostname": "minion-2.dev.kubernetes.org", - "privateIPAddress": "172.17.8.103", - "publicIPAddress": "172.17.8.103", - "property": [ - ] - } - ], + "clusterId": "kubernetes-cluster-1", + "description": "Kubernetes Cluster 1", + "kubernetesMaster": { + "hostId": "master", + "hostname": "master.dev.kubernetes.org", + "privateIPAddress": "172.17.8.101", + "publicIPAddress": "172.17.8.101", "property": [ - { - "name": "payload_parameter.MB_IP", - "value": "172.17.8.1" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "1883" - }, - { - "name": "payload_parameter.CEP_IP", - "value": "172.17.8.1" - }, - { - "name": "payload_parameter.CEP_PORT", - "value": "7711" - }, - { - "name": "payload_parameter.LOG_LEVEL", - "value": "DEBUG" - }, - { - "name": "payload_parameter.METADATA_SERVICE_URL", - "value": "https://172.17.8.1:9443"; - } ] + }, + "portRange": { + "upper": "32767", + "lower": "30000" + }, + "kubernetesHosts": [ + { + "hostId": "minion-1", + "hostname": "minion-1.dev.kubernetes.org", + "privateIPAddress": "172.17.8.102", + "publicIPAddress": "172.17.8.102", + "property": [ + ] + }, + { + "hostId": "minion-2", + "hostname": "minion-2.dev.kubernetes.org", + "privateIPAddress": "172.17.8.103", + "publicIPAddress": "172.17.8.103", + "property": [ + ] + } + ], + "property": [ + { + "name": "payload_parameter.MB_IP", + "value": "172.17.8.1" + }, + { + "name": "payload_parameter.MB_PORT", + "value": "1883" + }, + { + "name": "payload_parameter.CEP_URLS", + "value": "172.17.8.1:7711" + }, + { + "name": "payload_parameter.LOG_LEVEL", + "value": "DEBUG" + }, + { + "name": "payload_parameter.METADATA_SERVICE_URL", + "value": "https://172.17.8.1:9443"; + } + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/e33c3c93/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 0bd2260..a9189f3 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-2.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-2.json @@ -1,60 +1,56 @@ { - "clusterId": "kubernetes-cluster-2", - "description": "Kubernetes Cluster 2", - "kubernetesMaster": { - "hostId": "master", - "hostname": "master.dev.kubernetes.org", - "privateIPAddress": "172.17.8.101", - "publicIPAddress": "172.17.8.101", - "property": [ - ] - }, - "portRange": { - "upper": "32767", - "lower": "30000" - }, - "kubernetesHosts": [ - { - "hostId": "minion-1", - "hostname": "minion-1.dev.kubernetes.org", - "privateIPAddress": "172.17.8.102", - "publicIPAddress": "172.17.8.102", - "property": [ - ] - }, - { - "hostId": "minion-2", - "hostname": "minion-2.dev.kubernetes.org", - "privateIPAddress": "172.17.8.103", - "publicIPAddress": "172.17.8.103", - "property": [ - ] - } - ], + "clusterId": "kubernetes-cluster-2", + "description": "Kubernetes Cluster 2", + "kubernetesMaster": { + "hostId": "master", + "hostname": "master.dev.kubernetes.org", + "privateIPAddress": "172.17.8.101", + "publicIPAddress": "172.17.8.101", "property": [ - { - "name": "payload_parameter.MB_IP", - "value": "172.17.8.1" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "1883" - }, - { - "name": "payload_parameter.CEP_IP", - "value": "172.17.8.1" - }, - { - "name": "payload_parameter.CEP_PORT", - "value": "7711" - }, - { - "name": "payload_parameter.LOG_LEVEL", - "value": "DEBUG" - }, - { - "name": "payload_parameter.METADATA_SERVICE_URL", - "value": "https://172.17.8.1:9443"; - } ] + }, + "portRange": { + "upper": "32767", + "lower": "30000" + }, + "kubernetesHosts": [ + { + "hostId": "minion-1", + "hostname": "minion-1.dev.kubernetes.org", + "privateIPAddress": "172.17.8.102", + "publicIPAddress": "172.17.8.102", + "property": [ + ] + }, + { + "hostId": "minion-2", + "hostname": "minion-2.dev.kubernetes.org", + "privateIPAddress": "172.17.8.103", + "publicIPAddress": "172.17.8.103", + "property": [ + ] + } + ], + "property": [ + { + "name": "payload_parameter.MB_IP", + "value": "172.17.8.1" + }, + { + "name": "payload_parameter.MB_PORT", + "value": "1883" + }, + { + "name": "payload_parameter.CEP_URLS", + "value": "172.17.8.1:7711" + }, + { + "name": "payload_parameter.LOG_LEVEL", + "value": "DEBUG" + }, + { + "name": "payload_parameter.METADATA_SERVICE_URL", + "value": "https://172.17.8.1:9443"; + } + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/e33c3c93/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 02a26f9..dada472 100644 --- a/samples/kubernetes-clusters/kubernetes-cluster-ec2.json +++ b/samples/kubernetes-clusters/kubernetes-cluster-ec2.json @@ -1,68 +1,64 @@ { - "clusterId": "kubernetes-cluster-ec2", - "description": "Kubernetes Cluster EC2", - "kubernetesMaster": { - "hostId": "KubHostMaster1", - "hostname": "master.dev.kubernetes.example.org", - "privateIPAddress": "10.175.144.104", - "publicIPAddress": "54.151.228.48", - "property": [ - ] - }, - "portRange": { - "upper": "32767", - "lower": "30000" - }, - "kubernetesHosts": [ - { - "hostId": "KubHostSlave1", - "hostname": "slave1.dev.kubernetes.example.org", - "privateIPAddress": "10.151.10.16", - "publicIPAddress": "54.179.64.66", - "property": [ - ] - }, - { - "hostId": "KubHostSlave2", - "hostname": "slave2.dev.kubernetes.example.org", - "privateIPAddress": "10.150.148.75", - "publicIPAddress": "54.151.241.37", - "property": [ - ] - }, - { - "hostId": "KubHostSlave3", - "hostname": "slave2.dev.kubernetes.example.org", - "privateIPAddress": "10.148.100.77", - "publicIPAddress": "54.179.225.120", - "property": [ - ] - } - ], + "clusterId": "kubernetes-cluster-ec2", + "description": "Kubernetes Cluster EC2", + "kubernetesMaster": { + "hostId": "KubHostMaster1", + "hostname": "master.dev.kubernetes.example.org", + "privateIPAddress": "10.175.144.104", + "publicIPAddress": "54.151.228.48", "property": [ - { - "name": "payload_parameter.MB_IP", - "value": "54.179.197.243" - }, - { - "name": "payload_parameter.MB_PORT", - "value": "1883" - }, - { - "name": "payload_parameter.CEP_IP", - "value": "54.179.197.243" - }, - { - "name": "payload_parameter.CEP_PORT", - "value": "7711" - }, - { - "name": "payload_parameter.LOG_LEVEL", - "value": "DEBUG" - }, - { - "name": "payload_parameter.METADATA_SERVICE_URL", - "value": "https://54.179.197.243:9443"; - } ] + }, + "portRange": { + "upper": "32767", + "lower": "30000" + }, + "kubernetesHosts": [ + { + "hostId": "KubHostSlave1", + "hostname": "slave1.dev.kubernetes.example.org", + "privateIPAddress": "10.151.10.16", + "publicIPAddress": "54.179.64.66", + "property": [ + ] + }, + { + "hostId": "KubHostSlave2", + "hostname": "slave2.dev.kubernetes.example.org", + "privateIPAddress": "10.150.148.75", + "publicIPAddress": "54.151.241.37", + "property": [ + ] + }, + { + "hostId": "KubHostSlave3", + "hostname": "slave2.dev.kubernetes.example.org", + "privateIPAddress": "10.148.100.77", + "publicIPAddress": "54.179.225.120", + "property": [ + ] + } + ], + "property": [ + { + "name": "payload_parameter.MB_IP", + "value": "54.179.197.243" + }, + { + "name": "payload_parameter.MB_PORT", + "value": "1883" + }, + { + "name": "payload_parameter.CEP_URLS", + "value": "54.179.197.243:7711" + }, + { + "name": "payload_parameter.LOG_LEVEL", + "value": "DEBUG" + }, + { + "name": "payload_parameter.METADATA_SERVICE_URL", + "value": "https://54.179.197.243:9443"; + } + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/e33c3c93/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 9443a40..0db79d6 100755 --- a/tools/docker-images/cartridge-docker-images/base-image/files/run +++ b/tools/docker-images/cartridge-docker-images/base-image/files/run @@ -47,17 +47,10 @@ fi # defaults to the message broker IP if not set -if [ -z "${CEP_IP}" ]; then - sed -i "s/CEP-IP/${MB_IP}/g" ${PCA_HOME}/agent.conf +if [ -z "${CEP_URLS}" ]; then + sed -i "s/CEP-URLS/${MB_IP}:7711/g" ${PCA_HOME}/agent.conf else - sed -i "s/CEP-IP/${CEP_IP}/g" ${PCA_HOME}/agent.conf -fi - - -if [ -z "${CEP_PORT}" ]; then - sed -i "s/CEP-PORT/7711/g" ${PCA_HOME}/agent.conf -else - sed -i "s/CEP-PORT/${CEP_PORT}/g" ${PCA_HOME}/agent.conf + sed -i "s/CEP-URLS/${CEP_URLS}/g" ${PCA_HOME}/agent.conf fi if [ -z "${CEP_USERNAME}" ]; then
