Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Bump src/loggregator"

This reverts commit fc885d9.

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>
  • Loading branch information...
commit 55787d5c771a0978737e3c4f0d8895bedbdf3e43 1 parent 454593f
Alex Jackson authored jtuchscherer committed
View
5 jobs/dea_logging_agent/templates/dea_logging_agent.json.erb
@@ -1,7 +1,8 @@
{
"Index": <%= spec.index %>,
"LoggregatorAddress": "<%= p("loggregator_endpoint.host") %>:<%= p("loggregator_endpoint.port") %>",
- "SharedSecret": "<%= p("loggregator_endpoint.shared_secret") %>",
+ "SharedSecret": "<%= p("loggregator_endpoint.shared_secret") %>",
+
"NatsHost": "<%= p("nats.address") %>",
"NatsPort": <%= p("nats.port") %>,
"NatsUser": "<%= p("nats.user") %>",
@@ -12,4 +13,4 @@
<% if_p("syslog_aggregator") do |_| %>
, "Syslog": "vcap.dea_logging_agent"
<% end %>
-}
+}
View
2  jobs/loggregator/spec
@@ -39,8 +39,6 @@ properties:
description: "This property is not used by the job itself, but has the desired effect of restarting the loggregator jobs when the property changes on bosh deployment. See loggregator_trafficcontroller job spec for a description."
loggregator_endpoint.shared_secret:
description: "Shared secret used to verify cryptographically signed loggregator messages"
- etcd_ips:
- description: "IPs pointing to the ETCD cluster"
nats.user:
description: "Username for cc client to connect to NATS"
nats.password:
View
3  jobs/loggregator/templates/loggregator.json.erb
@@ -1,13 +1,12 @@
<% require 'json' %>
{
- "EtcdUrls": [<%= p("etcd_ips").map{|addr| "\"http://#{addr}:4001\""}.join(",")%>],
- "EtcdMaxConcurrentRequests" : 10,
"IncomingPort": <%= p("loggregator.incoming_port") %>,
"OutgoingPort": <%= p("loggregator.outgoing_port") %>,
"SkipCertVerify": <%= p("ssl.skip_cert_verify") %>,
"Index": <%= spec.index %>,
"MaxRetainedLogMessages": <%= p("loggregator.maxRetainedLogMessages") %>,
"SharedSecret": "<%= p("loggregator_endpoint.shared_secret") %>",
+
"NatsHost": "<%= p("nats.address") %>",
"NatsPort": <%= p("nats.port") %>,
"NatsUser": "<%= p("nats.user") %>",
View
1  jobs/loggregator_trafficcontroller/templates/loggregator_trafficcontroller.json.erb
@@ -8,6 +8,7 @@
"Host": "<%= p("traffic_controller.host") %>",
"ApiHost": "<%= p("cc.srv_api_uri") %>",
"SystemDomain": "<%= p("system_domain") %>",
+
"NatsHost": "<%= p("nats.address") %>",
"NatsPort": <%= p("nats.port") %>,
"NatsUser": "<%= p("nats.user") %>",
View
2  packages/dea_logging_agent/packaging
@@ -3,7 +3,7 @@ set -e -x
export GOROOT=$(readlink -nf /var/vcap/packages/golang)
export PATH=/var/vcap/packages/git/bin:$PATH
export PATH=$GOROOT/bin:$PATH
-
export GOPATH=$PWD/loggregator
+
go install deaagent/deaagent
cp -a $PWD/loggregator/bin/deaagent ${BOSH_INSTALL_TARGET}
View
2  packages/loggregator/packaging
@@ -3,8 +3,8 @@ set -e -x
export GOROOT=$(readlink -nf /var/vcap/packages/golang)
export PATH=/var/vcap/packages/git/bin:$PATH
export PATH=$GOROOT/bin:$PATH
-
export GOPATH=$PWD/loggregator
+
go install loggregator/loggregator
cp -a $PWD/loggregator/bin/loggregator ${BOSH_INSTALL_TARGET}
View
2  packages/loggregator_trafficcontroller/packaging
@@ -3,7 +3,7 @@ set -e -x
export GOROOT=$(readlink -nf /var/vcap/packages/golang)
export PATH=/var/vcap/packages/git/bin:$PATH
export PATH=$GOROOT/bin:$PATH
-
export GOPATH=$PWD/loggregator
+
go install trafficcontroller/trafficcontroller
cp -a $PWD/loggregator/bin/trafficcontroller ${BOSH_INSTALL_TARGET}
2  src/loggregator
@@ -1 +1 @@
-Subproject commit 34d725b588d99f83abfc970934594a598bad6ffa
+Subproject commit 40aabec67fd1fa59322396c8792ca2a76d10f1b3
View
8 templates/cf-infrastructure-warden.yml
@@ -9,6 +9,10 @@ meta:
name: bosh-warden-boshlite-ubuntu
version: latest
+ loggregator_endpoint:
+ z2:
+ host: "unused"
+
update:
canaries: 1
max_in_flight: 50
@@ -214,13 +218,13 @@ jobs:
instances: 0
networks:
- name: cf1
- static_ips: (( static_ips(10) ))
+ static_ips: []
- name: etcd_z2
instances: 0
networks:
- name: cf2
- static_ips: (( static_ips(9) ))
+ static_ips: []
# only need one router, and set up static IPs
- name: router_z1
View
2  templates/cf-jobs.yml
@@ -338,7 +338,6 @@ jobs:
- name: cf1
static_ips: (( merge ))
properties:
- etcd_ips: (( jobs.etcd_leader_z1.networks.cf1.static_ips jobs.etcd_z1.networks.cf1.static_ips jobs.etcd_z2.networks.cf2.static_ips ))
networks: (( meta.networks.z1 ))
- name: loggregator_z2
@@ -350,7 +349,6 @@ jobs:
- name: cf2
static_ips: (( merge ))
properties:
- etcd_ips: (( jobs.etcd_leader_z1.networks.cf1.static_ips jobs.etcd_z1.networks.cf1.static_ips jobs.etcd_z2.networks.cf2.static_ips ))
networks: (( meta.networks.z2 ))
- name: loggregator_trafficcontroller_z1

1 comment on commit 55787d5

@fraenkel
Owner

Are we saying that in the jobs it should be etcd.machines (aka ips), but for the parameter it should be something like etcdUrls?

Please sign in to comment.
Something went wrong with that request. Please try again.