summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-08 10:23:11 -0500
committerGitHub <noreply@github.com>2016-11-08 10:23:11 -0500
commit011f3d38f288f209db094777eadbcc304629c15b (patch)
tree96e571f5e5fca20781341f87b9b9fd629baa14d0 /roles
parentfe4d938f0386545709df76fc541559da17722552 (diff)
parent9dc6bd7f6f494c186baeb4731ddf7548904c18c0 (diff)
downloadopenshift-011f3d38f288f209db094777eadbcc304629c15b.tar.gz
openshift-011f3d38f288f209db094777eadbcc304629c15b.tar.bz2
openshift-011f3d38f288f209db094777eadbcc304629c15b.tar.xz
openshift-011f3d38f288f209db094777eadbcc304629c15b.zip
Merge pull request #2754 from jprovaznik/flannel_prefix
FIx flannel var name
Diffstat (limited to 'roles')
-rw-r--r--roles/flannel/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml
index a15969568..bf400cfe8 100644
--- a/roles/flannel/tasks/main.yml
+++ b/roles/flannel/tasks/main.yml
@@ -15,7 +15,7 @@
- { 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 }}' }
+ - { regexp: "^(FLANNEL_ETCD_PREFIX=)", line: '\1{{ flannel_etcd_key }}' }
- name: Set flannel options
become: yes