Repository: stratos Updated Branches: refs/heads/master 800120adc -> ceb79e8e9
Update puppet for HAProxy extension Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ceb79e8e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ceb79e8e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ceb79e8e Branch: refs/heads/master Commit: ceb79e8e9a725b2856299e9b7c5005d73ab6096b Parents: 800120a Author: Dinesh Bandara <[email protected]> Authored: Sat Sep 27 00:55:44 2014 +0530 Committer: Dinesh Bandara <[email protected]> Committed: Sat Sep 27 00:55:44 2014 +0530 ---------------------------------------------------------------------- .../haproxy-extension/src/main/bin/haproxy-extension.sh | 1 + tools/puppet3/modules/haproxy/manifests/init.pp | 2 ++ .../puppet3/modules/haproxy/templates/bin/haproxy-extension.sh.erb | 2 ++ 3 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ceb79e8e/extensions/load-balancer/haproxy-extension/src/main/bin/haproxy-extension.sh ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/haproxy-extension/src/main/bin/haproxy-extension.sh b/extensions/load-balancer/haproxy-extension/src/main/bin/haproxy-extension.sh index f8ed9b3..42d3e0b 100755 --- a/extensions/load-balancer/haproxy-extension/src/main/bin/haproxy-extension.sh +++ b/extensions/load-balancer/haproxy-extension/src/main/bin/haproxy-extension.sh @@ -41,6 +41,7 @@ properties="-Dhaproxy.private.ip=127.0.0.1 -Dnetwork.partition.id=network-partition-1 -Dcluster.id=cluster -Dservice.name=service + -Dload.balanced.service.type=lb-service-type -Dcep.stats.publisher.enabled=true" http://git-wip-us.apache.org/repos/asf/stratos/blob/ceb79e8e/tools/puppet3/modules/haproxy/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/haproxy/manifests/init.pp b/tools/puppet3/modules/haproxy/manifests/init.pp index 3187e04..774d939 100755 --- a/tools/puppet3/modules/haproxy/manifests/init.pp +++ b/tools/puppet3/modules/haproxy/manifests/init.pp @@ -23,6 +23,8 @@ class haproxy( $network_partition_id = $stratos_network_partition_id, $service_filter = $stratos_load_balanced_service_type, $cluster_id = $stratos_cluster_id, + $service_name = $stratos_instance_data_service_name, + $lb_service_type = $stratos_instance_data_lb_service_type, $version = '4.0.0', $owner = 'root', $group = 'root', http://git-wip-us.apache.org/repos/asf/stratos/blob/ceb79e8e/tools/puppet3/modules/haproxy/templates/bin/haproxy-extension.sh.erb ---------------------------------------------------------------------- diff --git a/tools/puppet3/modules/haproxy/templates/bin/haproxy-extension.sh.erb b/tools/puppet3/modules/haproxy/templates/bin/haproxy-extension.sh.erb index 4cb44d7..47ea03a 100755 --- a/tools/puppet3/modules/haproxy/templates/bin/haproxy-extension.sh.erb +++ b/tools/puppet3/modules/haproxy/templates/bin/haproxy-extension.sh.erb @@ -40,6 +40,8 @@ properties="-Dhaproxy.private.ip=0.0.0.0 -Dthrift.receiver.port=<%= @cep_port %> -Dnetwork.partition.id=<%= @network_partition_id %> -Dcluster.id=<%= @cluster_id %> + -Dservice.name=<%= @service_name %> + -Dload.balanced.service.type=<%= @lb_service_type %> -Dcep.stats.publisher.enabled=true" # Uncomment below line to enable remote debugging
