Merge pull request #2710 from smunilla/BZ1391515

Update flannel etcd vars for 0.5.5

roles/flannel/tasks/main.yml

@@ -4,21 +4,18 @@
   action: "{{ ansible_pkg_mgr }} name=flannel state=present"
   when: not openshift.common.is_containerized | bool
 
-- name: Set flannel etcd url
+- name: Set flannel etcd options
   become: yes
   lineinfile:
     dest: /etc/sysconfig/flanneld
     backrefs: yes
-    regexp: "^(FLANNEL_ETCD=)"
-    line: '\1{{ etcd_hosts|join(",") }}'
-
-- name: Set flannel etcd key
-  become: yes
-  lineinfile:
-    dest: /etc/sysconfig/flanneld
-    backrefs: yes
-    regexp: "^(FLANNEL_ETCD_KEY=)"
-    line: '\1{{ flannel_etcd_key }}'
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+    with_items:
+      - { regexp: "^(FLANNEL_ETCD=)", line: '\1{{ etcd_hosts|join(",") }}' }
+      - { regexp: "^(FLANNEL_ETCD_ENDPOINTS=)", line: '\1{{ etcd_hosts|join(",") }}' }
+      - { regexp: "^(FLANNEL_ETCD_KEY=)", line: '\1{{ flannel_etcd_key }}' }
+      - { regexp: "^(FLANNEL_ETCD_KEY_PREFIX=)", line: '\1{{ flannel_etcd_key }}' }
 
 - name: Set flannel options
   become: yes