Updates to Proxy and Session Daemon

DerekTBrown · DerekTBrown · commit f5e5cdfa3bb0 · 2017-08-05T01:56:42.000-07:00
diff --git a/Makefile b/Makefile
@@ -2,6 +2,10 @@
 #          TUXLAB INFRASTRUCTURE         #
 ##########################################
 
+# Setup Development Environment
+setup:
+	"10.100.1.10" >> /etc/resolver/ssh.tuxlab.local;
+
 # Up Vagrantfile
 up: destroy
 	rm ~/.ssh/known_hosts | true;
diff --git a/app b/app
@@ -1 +1 @@
-Subproject commit 727c284f76c4dcf485c124d315439465acafb073
+Subproject commit ab5343bd8f853ee3dbdd2595919ea025726a16fc
diff --git a/roles/meteor/tasks/main.yml b/roles/meteor/tasks/main.yml
@@ -6,6 +6,8 @@
 - name: install meteor
   become: yes
   shell: curl https://install.meteor.com/ | /bin/sh
+  args:
+    warn: false
   when: meteor_status.stdout == "false"
 
 - name: install g++
diff --git a/roles/tuxlab-proxy/templates/settings.json.j2 b/roles/tuxlab-proxy/templates/settings.json.j2
@@ -1,18 +1,20 @@
 {
   "etcd_conf" : {
-    "etcd_hosts" : ["https://{{ ansible_host }}:2379"],
+    "etcd_hosts" : "https://{{ ansible_host }}:2379",
     "etcd_conn_opts" : {
       "cert" : "/usr/lib/tuxlab/ssl/cert.pem",
       "key" : "/usr/lib/tuxlab/ssl/host.pem",
-      "cacert" : "/usr/lib/tuxlab/ssl/ca.pem"
+      "ca" : "/usr/lib/tuxlab/ssl/ca.pem"
     }
   },
   "docker_conf" : {
-    "docker_url" : "tcp://{{ ansible_host }}:2375",
     "docker_args" : {
+      "protocol" : "https",
+      "host" : "{{ ansible_host }}",
+      "port" : "2376",
       "cert" : "/usr/lib/tuxlab/ssl/cert.pem",
       "key" : "/usr/lib/tuxlab/ssl/host.pem",
-      "cacert" : "/usr/lib/tuxlab/ssl/ca.pem"
+      "ca" : "/usr/lib/tuxlab/ssl/ca.pem"
     }
   },
   "xterm_conf" : {
diff --git a/roles/tuxlab-session-daemon/tasks/main.yml b/roles/tuxlab-session-daemon/tasks/main.yml
diff --git a/roles/tuxlab-session-daemon/templates/settings.json.j2 b/roles/tuxlab-session-daemon/templates/settings.json.j2
diff --git a/setup.yml b/setup.yml
@@ -81,7 +81,6 @@
       - config.yml
     roles:
       - tuxlab-proxy
-      - tuxlab-session-daemon
 
   - name: Configure Meteor Applications
     hosts: tuxlab-meteor
diff --git a/test.yml b/test.yml
@@ -9,7 +9,6 @@
   - name: Validate ETCD Cluster
     hosts: all
     tasks:
-
       - shell: etcdctl cluster-health
         register: result
 
@@ -30,7 +29,16 @@
     tasks:
 
       - shell: docker -H {{ ansible_host }}:4000 info
+        become: yes
         register: result
 
       - debug:
           var: result.stdout
+
+  - name: Validate Proxy
+    hosts: tuxlab-swarm-host
+    tasks:
+
+      - shell: etcdctl ls
+      - debug:
+          var: result.stdout
