chore(database): bump confd to v0.8

Matthew Fisher · Matthew Fisher · commit 983a26b08583 · 2015-03-24T12:11:21.000-07:00
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -10,7 +10,7 @@ RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdem
     && chmod +x /usr/local/bin/etcdctl
 
 # install confd
-RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
+RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
     && chmod +x /usr/local/bin/confd
 
 ADD build.sh /tmp/build.sh
diff --git a/database/bin/boot b/database/bin/boot
@@ -49,7 +49,7 @@ etcd_set_default name ${PG_USER_DB:-deis}
 etcd_set_default bucketName ${BUCKET_NAME}
 
 # wait for confd to run once and install initial templates
-until confd -onetime -node $ETCD -config-file /app/confd.toml; do
+until confd -onetime -node $ETCD -confdir /app --interval 5 --quiet; do
 	echo "database: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
@@ -102,7 +102,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD -config-file /app/confd.toml &
+confd -node $ETCD -confdir /app --interval 5 --quiet &
 CONFD_PID=$!
 
 # wait for the service to become available
diff --git a/database/bin/check b/database/bin/check
diff --git a/database/conf.d/AWS_ACCESS_KEY_ID.toml b/database/conf.d/AWS_ACCESS_KEY_ID.toml
@@ -7,4 +7,3 @@ mode  = "0640"
 keys = [
   "/deis/store/gateway",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/database/conf.d/AWS_SECRET_ACCESS_KEY.toml b/database/conf.d/AWS_SECRET_ACCESS_KEY.toml
@@ -7,4 +7,3 @@ mode  = "0640"
 keys = [
   "/deis/store/gateway",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/database/conf.d/WALE_S3_ENDPOINT.toml b/database/conf.d/WALE_S3_ENDPOINT.toml
@@ -7,4 +7,3 @@ mode  = "0640"
 keys = [
   "/deis/store/gateway",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/database/conf.d/WALE_S3_PREFIX.toml b/database/conf.d/WALE_S3_PREFIX.toml
@@ -8,4 +8,3 @@ keys = [
   "/deis/store/gateway",
   "/deis/database",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
diff --git a/database/conf.d/pg_hba.conf.toml b/database/conf.d/pg_hba.conf.toml
@@ -7,5 +7,4 @@ mode  = "0640"
 keys = [
   "/deis/database",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/usr/local/bin/reload"
diff --git a/database/conf.d/postgresql.conf.toml b/database/conf.d/postgresql.conf.toml
@@ -7,5 +7,4 @@ mode  = "0644"
 keys = [
   "/deis/database",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/usr/local/bin/reload"
diff --git a/database/conf.d/reload.toml b/database/conf.d/reload.toml
@@ -7,5 +7,4 @@ mode  = "0755"
 keys = [
   "/deis/database",
 ]
-check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/usr/local/bin/reload"
diff --git a/database/confd.toml b/database/confd.toml
diff --git a/database/templates/AWS_ACCESS_KEY_ID b/database/templates/AWS_ACCESS_KEY_ID
@@ -1 +1 @@
-{{ .deis_store_gateway_accessKey }}
+{{ getv "/deis/store/gateway/accessKey" }}
diff --git a/database/templates/AWS_SECRET_ACCESS_KEY b/database/templates/AWS_SECRET_ACCESS_KEY
@@ -1 +1 @@
-{{ .deis_store_gateway_secretKey }}
+{{ getv "/deis/store/gateway/secretKey" }}
diff --git a/database/templates/WALE_S3_ENDPOINT b/database/templates/WALE_S3_ENDPOINT
@@ -1 +1 @@
-http+path://{{ .deis_store_gateway_host }}:{{ .deis_store_gateway_port }}
+http+path://{{ getv "/deis/store/gateway/host" }}:{{ getv "/deis/store/gateway/port" }}
diff --git a/database/templates/WALE_S3_PREFIX b/database/templates/WALE_S3_PREFIX
@@ -1 +1 @@
-s3://{{ .deis_database_bucketName }}
+s3://{{ getv "/deis/database/bucketName" }}
diff --git a/database/templates/create_bucket b/database/templates/create_bucket
@@ -3,8 +3,8 @@ import boto
 import sys
 from boto.s3.connection import OrdinaryCallingFormat
 
-conn = boto.connect_s3(host='{{ .deis_store_gateway_host }}',
-                       port={{ .deis_store_gateway_port }},
+conn = boto.connect_s3(host='{{ getv "/deis/store/gateway/host" }}',
+                       port={{ getv "/deis/store/gateway/port" }},
                        is_secure=False,
                        calling_format=OrdinaryCallingFormat(),
                       )
diff --git a/database/templates/reload b/database/templates/reload
@@ -10,10 +10,10 @@ PG_LISTEN=${PG_LISTEN:-*}
 
 # run idemptoent database configuration
 sudo -i -u postgres psql postgres <<EOF
-ALTER ROLE postgres WITH PASSWORD '{{ .deis_database_adminPass }}';
-CREATE ROLE {{ .deis_database_user }} WITH LOGIN;
-ALTER ROLE {{ .deis_database_user }} WITH PASSWORD '{{ .deis_database_password }}';
-CREATE DATABASE {{ .deis_database_name }} WITH OWNER {{ .deis_database_user }};
+ALTER ROLE postgres WITH PASSWORD '{{ getv "/deis/database/adminPass" }}';
+CREATE ROLE {{ getv "/deis/database/user" }} WITH LOGIN;
+ALTER ROLE {{ getv "/deis/database/user" }} WITH PASSWORD '{{ getv "/deis/database/password" }}';
+CREATE DATABASE {{ getv "/deis/database/name" }} WITH OWNER {{ getv "/deis/database/user" }};
 EOF
 
-exit 0
+exit 0

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,3 @@ mode = "0640"`
`7`	`7`	`keys = [`
`8`	`8`	`"/deis/store/gateway",`
`9`	`9`	`]`
`10`		`-check_cmd = "/app/bin/check {{ .src }}"`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,3 @@ keys = [`
`8`	`8`	`"/deis/store/gateway",`
`9`	`9`	`"/deis/database",`
`10`	`10`	`]`
`11`		`-check_cmd = "/app/bin/check {{ .src }}"`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ mode = "0640"`
`7`	`7`	`keys = [`
`8`	`8`	`"/deis/database",`
`9`	`9`	`]`
`10`		`-check_cmd = "/app/bin/check {{ .src }}"`
`11`	`10`	`reload_cmd = "/usr/local/bin/reload"`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ mode = "0644"`
`7`	`7`	`keys = [`
`8`	`8`	`"/deis/database",`
`9`	`9`	`]`
`10`		`-check_cmd = "/app/bin/check {{ .src }}"`
`11`	`10`	`reload_cmd = "/usr/local/bin/reload"`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ mode = "0755"`
`7`	`7`	`keys = [`
`8`	`8`	`"/deis/database",`
`9`	`9`	`]`
`10`		`-check_cmd = "/app/bin/check {{ .src }}"`
`11`	`10`	`reload_cmd = "/usr/local/bin/reload"`