Merge pull request #29 from chef/BLDR-20

Merged change 3742a92a-7588-403e-b33e-18934930a5e6 From review branch BLDR-20 into master Signed-off-by: fnichol <[email protected]>
habitat-sh · Nov 5, 2015 · edb2bd2 · edb2bd2
2 parents 71bf294 + e7149ab
commit edb2bd2
Show file tree

Hide file tree

Showing 27 changed files with 1,755 additions and 1,320 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,13 +27,11 @@ toml = "*"
 regex = "*"
 libc = "*"
 url = "*"
-inotify = "*"
 fnv = "*"
 iron = "*"
 router = "*"
-mount = "*"
-staticfile = "*"
 time = "*"
+uuid = "*"
 
 [dependencies.wonder]
 path = "./vendor/wonder"

diff --git a/demo/etcd-clean.sh b/demo/etcd-clean.sh
@@ -2,4 +2,4 @@
 
 #etcd_ipaddress=$(docker inspect $(docker ps | grep etcd | cut -d " " -f 1)  | jq -r '.[0].NetworkSettings.IPAddress')
 etcd_ipaddress=$(docker-machine ip default)
-curl -X DELETE http://$etcd_ipaddress:4001/v2/keys/bldr/redis/default/config
+curl -X DELETE http://$etcd_ipaddress:4001/v2/keys/bldr?recursive=true
diff --git a/packages/haproxy/config/haproxy.conf b/packages/haproxy/config/haproxy.conf
@@ -1,5 +1,4 @@
 {{#watch}}
-{{#groups}}
 defaults {{service-name}}_{{group-name}}
 {{#tcp-enable}}
   mode tcp
@@ -9,7 +8,7 @@ defaults {{service-name}}_{{group-name}}
 {{/tcp-enable}}
 
 frontend ft_{{service-name}}_{{group-name}}
- bind {{bind}}:{{config.topology.leader.port}} name {{service-name}}_{{group-name}}
+ bind {{bind}}:{{census.leader.port}} name {{service-name}}_{{group-name}}
  default_backend bk_{{service-name}}_{{group-name}}
  option tcplog
  option logasap
@@ -19,8 +18,7 @@ backend bk_{{service-name}}_{{group-name}}
  option httpchk GET /health HTTP/1.1\r\nHost:\ bldr
  http-check expect rstring topology-leader\ =\ true
 
- {{#config.topology.census}}
+ {{#census.members}}
  server {{hostname}} {{ip}}:{{port}} check port 9631 inter 1s
- {{/config.topology.census}}
-{{/groups}}
+ {{/census.members}}
 {{/watch}}
diff --git a/packages/redis/config/redis.config b/packages/redis/config/redis.config
@@ -207,11 +207,11 @@ dir /opt/bldr/srvc/redis/data
 #    and resynchronize with them.
 #
 # slaveof <masterip> <masterport>
-{{#topology-follower}}
-{{#topology.leader}}
+{{#census.me.follower}}
+{{#census.leader}}
 slaveof {{ip}} {{port}}
-{{/topology.leader}}
-{{/topology-follower}}
+{{/census.leader}}
+{{/census.me.follower}}
 
 # If the master is password protected (using the "requirepass" configuration
 # directive below) it is possible to tell the slave to authenticate before