Merge pull request #59 from redhat-nfvpe/fixheketi

Pins Heketi image to work-around upstream gluster-kubernetes bug

group_vars/all.yml

@@ -36,8 +36,8 @@ bridge_name: virbr0
 virtual_machines:
   - kube-master
   - kube-node-1
-#  - kube-node-2
-#  - kube-node-3
+  - kube-node-2
+  - kube-node-3
 vm_parameters_ram_mb: 2048
 vm_parameters_cpus: 4
 
@@ -56,15 +56,21 @@ multus_ipam_gateway: "192.168.122.1"
 # ----------------------------
 # glusterfs vars
 # ----------------------------
+
 # Hey what's that treeish?
 # It's the last known point Doug knows is good.
 # e.g. https://github.com/gluster/gluster-kubernetes/commit/e7799c152bf456dd7692bcb7c86bcef422c7b6c8
 gluster_kubernetes_version: "e7799c152bf456dd7692bcb7c86bcef422c7b6c8"
 gluster_attach_disk: true
+# New heketi image version gave Doug some trouble @ https://github.com/gluster/gluster-kubernetes/issues/363
+heketi_image_name: heketi/heketi:4
+
+# Disk sizes (for virtual machines)
 spare_disk_size_megs: 10240
 spare_disk_location: "/var/lib/libvirt/images"
 spare_disk_dev: vdb
 # Default size is megs, "2G" would be 2 gigs.
+# This is likely deprecated, Doug (9/25/17)
 brick_size: "1980"
 
 # ----------------------------

roles/glusterfs-kube-config/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+gk_deploy_wait_seconds: 900

roles/glusterfs-kube-config/tasks/main.yml

@@ -43,6 +43,13 @@
     dest: /home/centos/gluster-kubernetes
     version: "{{ gluster_kubernetes_version }}"
 
+- name: Change heketi image tag (hackish sed, I know. I know. But, as a stop gap.)
+  shell: >
+    find . -type f -print0 | xargs -0 sed -i 's|heketi/heketi:dev|{{ heketi_image_name }}|g'
+  args:
+    chdir: /home/centos/gluster-kubernetes
+  when: "heketi_image_name != 'heketi/heketi:dev'"
+
 - name: Template GlusterFS gk-deploy topology json
   template:
     src: glusterfs-topology.json.j2
@@ -74,7 +81,7 @@
 
 - name: Deploy GlusterFS on Kubernetes with gk-deploy (note -- this is coffee break worthy, it takes a while)
   shell: >
-    ./gk-deploy -n gluster -g -y
+    ./gk-deploy -n gluster -w {{ gk_deploy_wait_seconds }} -g -y
   args:
     chdir: /home/centos/gluster-kubernetes/deploy
     creates: /home/centos/.gk-deployed