Fix CEP_URLs in Puppet scripts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aa925bb7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aa925bb7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aa925bb7 Branch: refs/heads/stratos-4.1.x Commit: aa925bb7437a0a78bb56907fc27727a6f2d48fa3 Parents: e33c3c9 Author: Akila Perera <[email protected]> Authored: Sun Sep 20 11:18:31 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Sun Sep 20 11:18:31 2015 +0530 ---------------------------------------------------------------------- tools/puppet3/manifests/nodes/base.pp | 50 ++++++++++---------- .../python_agent/templates/agent.conf.erb | 3 +- 2 files changed, 26 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aa925bb7/tools/puppet3/manifests/nodes/base.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/manifests/nodes/base.pp b/tools/puppet3/manifests/nodes/base.pp index 412aa31..b15e463 100755 --- a/tools/puppet3/manifests/nodes/base.pp +++ b/tools/puppet3/manifests/nodes/base.pp @@ -18,30 +18,30 @@ # Stratos base node node 'base' { - #essential variables - $package_repo = 'http://10.4.128.7' - $local_package_dir = '/mnt/packs' - $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 = '7711' - $cep_username ='admin' - $cep_password ='admin' - $truststore_password = 'wso2carbon' - $java_distribution = 'jdk-7u80-linux-x64.tar.gz' - $java_name = 'jdk1.7.0_80' - $member_type_ip = 'private' - $lb_httpPort = '80' - $lb_httpsPort = '443' - $tomcat_version = '7.0.52' - $enable_log_publisher = 'false' - $bam_ip = '127.0.0.1' - $bam_port = '7611' - $bam_secure_port = '7711' - $bam_username = 'admin' - $bam_password = 'admin' - #metadata_service_url should be 'https://SM-IP:SM-Port' - $metadata_service_url = 'https://127.0.0.1:9443' +#essential variables + $package_repo = 'http://10.4.128.7' + $local_package_dir = '/mnt/packs' + $mb_url = 'tcp://127.0.0.1:1883' + $mb_type = 'activemq' #in wso2 mb case, value should be 'wso2mb' + $cep_urls = '127.0.0.1:7711' # comma separated list of CEP URLs + $cep_ip = '127.0.0.1' + $cep_port = '7711' + $cep_username = 'admin' + $cep_password = 'admin' + $truststore_password = 'wso2carbon' + $java_distribution = 'jdk-7u80-linux-x64.tar.gz' + $java_name = 'jdk1.7.0_80' + $member_type_ip = 'private' + $lb_httpPort = '80' + $lb_httpsPort = '443' + $tomcat_version = '7.0.52' + $enable_log_publisher = 'false' + $bam_ip = '127.0.0.1' + $bam_port = '7611' + $bam_secure_port = '7711' + $bam_username = 'admin' + $bam_password = 'admin' + $metadata_service_url = 'https://127.0.0.1:9443' #metadata_service_url should be 'https://SM-IP:SM-Port' - require stratos_base + require stratos_base } http://git-wip-us.apache.org/repos/asf/stratos/blob/aa925bb7/tools/puppet3/modules/python_agent/templates/agent.conf.erb ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/python_agent/templates/agent.conf.erb b/tools/puppet3/modules/python_agent/templates/agent.conf.erb index a088e3f..56025c2 100644 --- a/tools/puppet3/modules/python_agent/templates/agent.conf.erb +++ b/tools/puppet3/modules/python_agent/templates/agent.conf.erb @@ -19,8 +19,7 @@ mb.ip =<%= @mb_ip %> mb.port =<%= @mb_port %> listen.address =localhost -thrift.receiver.ip =<%= @cep_ip %> -thrift.receiver.port =<%= @cep_port %> +thrift.receiver.urls =<%= @cep_urls %> thrift.server.admin.username =<%= @cep_username %> thrift.server.admin.password =<%= @cep_password %> cep.stats.publisher.enabled =true
