Repository: stratos Updated Branches: refs/heads/master 2760ac357 -> 28c24ddb3
Fixing STRATOS-850 Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/28c24ddb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/28c24ddb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/28c24ddb Branch: refs/heads/master Commit: 28c24ddb305a12905323d319bcd007b73a701394 Parents: 2760ac3 Author: sajhak <[email protected]> Authored: Tue Sep 30 16:58:03 2014 +0530 Committer: sajhak <[email protected]> Committed: Tue Sep 30 16:58:03 2014 +0530 ---------------------------------------------------------------------- tools/puppet3/manifests/nodes/base.pp | 2 +- tools/puppet3/modules/agent/manifests/init.pp | 1 + .../templates/conf/mqtttopic.properties.erb | 21 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/28c24ddb/tools/puppet3/manifests/nodes/base.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/manifests/nodes/base.pp b/tools/puppet3/manifests/nodes/base.pp index 1584c24..ebc1aa5 100755 --- a/tools/puppet3/manifests/nodes/base.pp +++ b/tools/puppet3/manifests/nodes/base.pp @@ -21,7 +21,7 @@ node 'base' { #essential variables $package_repo = 'http://10.4.128.7' $local_package_dir = '/mnt/packs' - $mb_url = 'tcp://127.0.0.1:61616' + $mb_url = 'tcp://127.0.0.1:1883' $mb_type = 'activemq' #in wso2 mb case, value should be 'wso2mb' $cep_ip = '127.0.0.1' $cep_port = '7611' http://git-wip-us.apache.org/repos/asf/stratos/blob/28c24ddb/tools/puppet3/modules/agent/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/manifests/init.pp b/tools/puppet3/modules/agent/manifests/init.pp index 05d2b4c..ea67b7c 100644 --- a/tools/puppet3/modules/agent/manifests/init.pp +++ b/tools/puppet3/modules/agent/manifests/init.pp @@ -40,6 +40,7 @@ class agent( 'bin/stratos.sh', 'conf/jndi.properties', 'conf/log4j.properties', + 'conf/mqtttopic.properties', 'extensions/clean.sh', 'extensions/instance-activated.sh', 'extensions/instance-started.sh', http://git-wip-us.apache.org/repos/asf/stratos/blob/28c24ddb/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb b/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb new file mode 100644 index 0000000..963e301 --- /dev/null +++ b/tools/puppet3/modules/agent/templates/conf/mqtttopic.properties.erb @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +mqtturl=<%= @mb_url %> +clientID=stratos +tempfilelocation=/tmp
