Make it possible to run Jetstream Swarm nodes w/o a separate volume.

Update the image and run in an m1.medium.

env/jsdocker/_inc_spawn.yml

@@ -38,9 +38,13 @@
             ansible_host: "{{ spawned_out.server.private_v4 }}"
             ansible_ssh_common_args: "-F {{ inventory_dir }}/ssh_config.{{ spawned_out.server.cloud }}"
             cloud_id: "{{ spawned_out.server.cloud }}"
-            volume_dev: "{{ spawned_out.server.volumes[0].device }}"
             floating_ip: "{{ spawned_out.server.public_v4 }}"
           delegate_to: localhost
+        - name: Set volume device fact
+          set_fact:
+            volume_dev: "{{ spawned_out.server.volumes[0].device }}"
+          delegate_to: localhost
+          when: volume_name is defined
         - name: Print spawned instance IPs
           debug:
             var: "{{ item }}"

env/jsdocker/group_vars/all/vars.yml

@@ -5,10 +5,14 @@ swarm_ssh_key: "{{ vault_swarm_ssh_key }}"
 
 ansible_user: centos
 ansible_ssh_private_key_file: "{{ inventory_dir }}/swarm_kp.pem"
-base_name: galaxy-docker-20180313
-volume_size: 16
-flavor: m1.small
+base_name: galaxy-docker-20180522
+#volume_size: 16
+flavor: m1.medium
 key_name: swarm_kp
 nics: net-name=usegalaxy
 security_groups: default
 auto_ip: no
+
+image_names:
+  - quay.io/bgruening/docker-jupyter-notebook:17.09
+  - shiltemann/ethercalc-galaxy-ie

env/jsdocker/group_vars/baseinstances.yml

@@ -1,4 +1,4 @@
 ---
 
-image: JS-API-Featured-Centos7-Feb-13-2018
-volume_name: "{{ base_name }}"
+image: JS-API-Featured-CentOS7-May-11-2018
+#volume_name: "{{ base_name }}"

env/jsdocker/group_vars/imageinstances.yml

@@ -2,7 +2,4 @@
 
 image: "{{ base_name }}"
 
-volume_name: galaxy-gie-all-20180313
-image_names:
-  - quay.io/bgruening/docker-jupyter-notebook:17.09
-  - shiltemann/ethercalc-galaxy-ie
+#volume_name: galaxy-gie-all-20180522

env/jsdocker/launch_test_instance.yml

@@ -26,9 +26,11 @@
           command: "openstack volume snapshot list -f value -c ID --volume {{ volume_name }}"
           register: docker_snapshot_id_out
           delegate_to: localhost
+          when: volume_name is defined
         - name: Set volume snapshot id fact
           set_fact:
             volume_snapshot_id: "{{ docker_snapshot_id_out.stdout }}"
+          when: volume_name is defined
       rescue:
         - include: _inc_clean.yml
 

env/jsdocker/snapshot_base.yml

@@ -26,18 +26,24 @@
           filesystem:
             dev: "{{ volume_dev }}"
             fstype: xfs
+          when: volume_name is defined
         - name: Mount /var/lib/docker
           mount:
             src: "{{ volume_dev }}"
             name: "/var/lib/docker"
             fstype: xfs
             state: mounted
+          when: volume_name is defined
       rescue:
         - include: _inc_clean.yml
   roles:
     - docker
   post_tasks:
     - block:
+        - name: Pull docker images
+          command: "docker pull {{ item }}"
+          with_items: "{{ image_names }}"
+          when: volume_name is not defined
         - name: Install qemu-guest-agent
           yum:
             name: qemu-guest-agent
@@ -94,6 +100,7 @@
           mount:
             name: "/var/lib/docker"
             state: unmounted
+          when: volume_name is defined
         - name: Touch /.autorelabel
           file:
             path: /.autorelabel

roles/docker/tasks/install_debian.yml

@@ -88,5 +88,5 @@
 - name: Start/enable or stop/disable docker as desired
   service:
     name: docker
-    state: "{{ 'running' if docker_service_enabled else 'stopped' }}"
+    state: "{{ 'started' if docker_service_enabled else 'stopped' }}"
     enabled: "{{ docker_service_enabled }}"

roles/docker/tasks/install_redhat.yml

@@ -53,5 +53,5 @@
 - name: Start/enable or stop/disable docker as desired
   service:
     name: docker
-    state: "{{ 'running' if docker_service_enabled else 'stopped' }}"
+    state: "{{ 'started' if docker_service_enabled else 'stopped' }}"
     enabled: "{{ docker_service_enabled }}"