diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-11 16:13:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 16:13:11 -0800 |
| commit | cf1c664948b6c3aaf57bad485fdd1daa201d9c8c (patch) | |
| tree | 409b82d7d614dad2fb80eb8b794f6667f8679132 /roles/calico | |
| parent | 24a48f8ed440b808265982d848a0af050920d73c (diff) | |
| parent | ed4d3fb42125405f8dd0765b4a42c618a9916f22 (diff) | |
| download | openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.gz openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.bz2 openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.xz openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.zip | |
Merge pull request #6414 from mgugino-upstream-stage/remove-embedded-etcd
Automatic merge from submit-queue.
Remove unneeded embedded etcd logic
Removing some remaining embedded etcd facts except
for the migration plays.
Diffstat (limited to 'roles/calico')
| -rw-r--r-- | roles/calico/tasks/main.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/calico/tasks/main.yml b/roles/calico/tasks/main.yml index 0e3863304..bbc6edd48 100644 --- a/roles/calico/tasks/main.yml +++ b/roles/calico/tasks/main.yml @@ -14,7 +14,6 @@ vars: etcd_cert_prefix: calico.etcd- etcd_cert_config_dir: "{{ openshift.common.config_base }}/calico" - embedded_etcd: "{{ hostvars[groups.oo_first_master.0].openshift.master.embedded_etcd }}" etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" etcd_cert_subdir: "openshift-calico-{{ openshift.common.hostname }}" |