Merge pull request #646 from opdemand/fix-registry-seed

fix confd wait issue

Author: mboersma

controller/Dockerfile

@@ -30,8 +30,11 @@ RUN useradd deis --groups sudo --home-dir /app --shell /bin/bash
 RUN sed -i -e 's/%sudo\tALL=(ALL:ALL) ALL/%sudo\tALL=(ALL:ALL) NOPASSWD:ALL/' /etc/sudoers
 RUN chown -R deis:deis /app
 
+# create directory for confd templates
+RUN mkdir -p /templates && chown -R deis:deis /templates
+
 # create directory for logs
-RUN mkdir -p /app/logs && chown -R deis:deis /app/logs
+RUN mkdir -p /var/log/deis && chown -R deis:deis /var/log/deis
 
 # define the execution environment
 CMD ["/app/bin/boot"]

controller/Makefile

@@ -12,16 +12,16 @@ coverage:
 	coverage html
 
 build:
-	docker build -t deis/server .
+	docker build -t deis/controller .
 
 run:
-	docker run -rm -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-server deis/server ; exit 0
+	docker run -rm -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-controller deis/controller ; exit 0
 
 shell:
-	docker run -t -i -rm -e ETCD=$${ETCD:-127.0.0.1:4001} deis/server /bin/bash
+	docker run -t -i -rm -e ETCD=$${ETCD:-127.0.0.1:4001} deis/controller /bin/bash
 
 clean:
-	-docker rmi deis/server
+	-docker rmi deis/controller
 
 flake8:
 	flake8

controller/bin/boot

@@ -32,7 +32,7 @@ until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do
 done
 
 # wait for confd to populate all values
-while grep -q '<no value>' /app/confd_settings.py; do
+while grep -q '<no value>' /templates/confd_settings.py; do
        echo "waiting for confd to write all values..."
        confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null
        sleep $(($ETCD_TTL/2))  # sleep for half the TTL

controller/bin/start

@@ -7,5 +7,8 @@ cd /app
 # run an idempotent database migration
 sudo -E -u deis ./manage.py syncdb --migrate --noinput
 
+# spawn celery worker in the background
+sudo -E -u deis celery worker --app=deis --loglevel=INFO --workdir=/app --pidfile=/tmp/celery.pid &
+
 # spawn a gunicorn server in the foreground
-sudo -E -u deis ./manage.py run_gunicorn -b 0.0.0.0 -w 8 -t 600 -n deis --log-level debug # -k gevent
+sudo -E -u deis ./manage.py run_gunicorn -b 0.0.0.0 -w 8 -t 600 -n deis --log-level debug --pid=/tmp/gunicorn.pid # -k gevent

controller/conf.d/confd_settings.toml

@@ -1,6 +1,6 @@
 [template]
 src   = "confd_settings.py"
-dest  = "/app/confd_settings.py"
+dest  = "/templates/confd_settings.py"
 uid = 1000
 gid = 1000
 mode  = "0640"

controller/confd.toml

@@ -2,4 +2,4 @@
 confdir  = "/app"
 interval = 5
 prefix   = "/"
-quiet = true
+quiet = true

controller/deis/settings.py

@@ -317,8 +317,8 @@
 
 # import dynamic confd settings from /app, if they exist
 try:
-    if os.path.exists('/app/confd_settings.py'):
-        sys.path.append('/app')
+    if os.path.exists('/templates/confd_settings.py'):
+        sys.path.append('/templates')
         from confd_settings import *  # noqa
 except ImportError:
     pass

controller/templates/confd_settings.py

@@ -26,7 +26,7 @@
 CELERY_RESULT_BACKEND = BROKER_URL
 
 # move log directory out of /app/deis
-DEIS_LOG_DIR = '/app/logs'
+DEIS_LOG_DIR = '/var/log/deis'
 
 # specify which provider API modules to load
 PROVIDER_MODULES = ('mock', 'digitalocean', 'ec2', 'rackspace', 'vagrant', 'static')

controller/templates/reload

@@ -1,14 +1,25 @@
 #!/bin/bash
 
-# write out chef configuration
-sudo mkdir -p /etc/chef
-sudo chown deis /etc/chef
-echo {{ .deis_chef_clientKey }} | base64 -d > /etc/chef/client.pem
-echo {{ .deis_chef_validationKey }} | base64 -d > /etc/chef/validation.pem
-cat > /etc/chef/client.rb <<EOF
+# write out chef configuration if necessary
+if [[ "{{ .deis_controller_cmModule }}" == "cm.chef" ]]; then
+
+	# write out chef configuration
+	sudo mkdir -p /etc/chef
+	sudo chown deis /etc/chef
+	echo "{{ .deis_chef_clientKey }}" | base64 -d > /etc/chef/client.pem
+	echo "{{ .deis_chef_validationKey }}" | base64 -d > /etc/chef/validation.pem
+	cat > /etc/chef/client.rb <<EOF
 log_level        :auto
 log_location     STDOUT
 chef_server_url  "{{ .deis_chef_url }}"
 validation_client_name "{{ .deis_chef_validationName }}"
 node_name        "{{ .deis_chef_clientName }}"
 EOF
+
+fi
+
+# gracefully reload celery and gunicorn
+test -e /tmp/celery.pid && kill -HUP `cat /tmp/celery.pid`
+test -e /tmp/gunicorn.pid && kill -HUP `cat /tmp/gunicorn.pid`
+
+exit 0

registry/bin/seed

@@ -1,11 +1,8 @@
 #!/bin/bash
 set -eo pipefail
 
-# if the keyspace already exists, exit early
-etcdctl -C $ETCD ls $ETCD_PATH >/dev/null && exit 0
-
 # seed etcd with default configuration
 etcdctl -C $ETCD set $ETCD_PATH/protocol http
-etcdctl -C $ETCD set $ETCD_PATH/secretKey ${REGISTRY_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
+etcdctl -C $ETCD ls $ETCD_PATH/secretKey >/dev/null || etcdctl -C $ETCD set $ETCD_PATH/secretKey ${REGISTRY_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
 
-exit 0
+exit 0