Merge branch 'master' of github.com:sidharthamani/os into sidharthamani-master

Conflicts:
	config/default.go

scripts/dockerimages/04-cloudconfig

@@ -0,0 +1,3 @@
+FROM base 
+COPY scripts/dockerimages/scripts/cloud-config.sh  /
+CMD ["/cloud-config.sh"]

scripts/dockerimages/scripts/cloud-config.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -x -e
+
+CLOUD_CONFIG_FLAGS=$(rancherctl config get cloud_config)
+
+cloudinit --preinit "$CLOUD_CONFIG_FLAGS"

scripts/dockerimages/scripts/console.sh

@@ -3,6 +3,12 @@
 #if [ -t 1 ]; then
     #exec /bin/sh
 #else
+
+CLOUD_CONFIG_FILE=/var/lib/rancher/cloud-config
+
+if [ -s $CLOUD_CONFIG_FILE ]; then
+	cloudinit --from-file $CLOUD_CONFIG_FILE
+fi
     exec respawn << EOF
 /sbin/getty 115200 tty1
 /sbin/getty 115200 tty2

scripts/dockerimages/scripts/docker.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -x -e
 
 CGROUPS="perf_event net_cls freezer devices blkio memory cpuacct cpu cpuset"
@@ -16,4 +16,33 @@ if ! lsmod | grep -q br_netfilter; then
 fi
 
 rm -f /var/run/docker.pid
-exec docker -d -s overlay
+
+USE_TLS=$(rancherctl config get userdocker.use_tls)
+
+if [ "$USE_TLS" == "true" ]; then
+    TLS_CA_CERT=$(rancherctl config get userdocker.tls_ca_cert)
+    TLS_SERVER_CERT=$(rancherctl config get userdocker.tls_server_cert)
+    TLS_SERVER_KEY=$(rancherctl config get userdocker.tls_server_key)    
+
+    TLS_PATH=/etc/docker/tls
+    mkdir -p $TLS_PATH 
+
+    if [ -n "$TLS_CA_CERT" ] && [ -n "$TLS_SERVER_CERT" ] && [ -n "$TLS_SERVER_KEY" ]; then
+	echo "$TLS_CA_CERT" > $TLS_PATH/ca.pem
+	echo "$TLS_SERVER_CERT" > $TLS_PATH/server-cert.pem
+	echo "$TLS_SERVER_KEY" > $TLS_PATH/server-key.pem
+    else
+        tlsconf
+    	TLS_CA_CERT="$(cat $TLS_PATH/ca.pem)"
+    	TLS_SERVER_CERT="$(cat $TLS_PATH/server-cert.pem)"
+    	TLS_SERVER_KEY="$(cat $TLS_PATH/server-key.pem)"
+    fi 
+    
+    rancherctl config set -- userdocker.tls_ca_cert "$TLS_CA_CERT"
+    rancherctl config set -- userdocker.tls_server_cert "$TLS_SERVER_CERT"
+    rancherctl config set -- userdocker.tls_server_key "$TLS_SERVER_KEY"
+
+    exec docker -d -s overlay --tlsverify --tlscacert=$TLS_PATH/ca.pem --tlscert=$TLS_PATH/server-cert.pem --tlskey=$TLS_PATH/server-key.pem -H=0.0.0.0:2376 -H=unix:///var/run/docker.sock
+else
+    exec docker -d -s overlay
+fi