diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-03 14:46:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 14:46:16 -0400 |
| commit | 36175436ec62ea81414450524e37011f822654f9 (patch) | |
| tree | 85dfeb3291c535af7e138da0937ce0220677cb9f | |
| parent | 17c3d6236adea676c3d9248c3d2f7afb0d582750 (diff) | |
| parent | 0a0f0fc3126179b01f45f76cc85bc30cee428070 (diff) | |
| download | openshift-36175436ec62ea81414450524e37011f822654f9.tar.gz openshift-36175436ec62ea81414450524e37011f822654f9.tar.bz2 openshift-36175436ec62ea81414450524e37011f822654f9.tar.xz openshift-36175436ec62ea81414450524e37011f822654f9.zip | |
Merge pull request #2710 from smunilla/BZ1391515
Update flannel etcd vars for 0.5.5
| -rw-r--r-- | roles/flannel/tasks/main.yml | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index 6b6dfb423..d41eb0de8 100644 --- a/roles/flannel/tasks/main.yml +++ b/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 |