summaryrefslogtreecommitdiffstats
path: root/roles/calico/tasks/main.yml
diff options
context:
space:
mode:
authorDan Osborne <djosborne10@gmail.com>2017-05-19 14:49:52 -0700
committerDan Osborne <djosborne10@gmail.com>2017-05-24 16:20:04 -0700
commit854a77ce23135f0ef27c79338b48aa53e49d8202 (patch)
treea4c296302c48002d384b298e43d5749480e821d0 /roles/calico/tasks/main.yml
parent8c57b7f62f6351d03c1e28d7cff88279fc16f88a (diff)
downloadopenshift-854a77ce23135f0ef27c79338b48aa53e49d8202.tar.gz
openshift-854a77ce23135f0ef27c79338b48aa53e49d8202.tar.bz2
openshift-854a77ce23135f0ef27c79338b48aa53e49d8202.tar.xz
openshift-854a77ce23135f0ef27c79338b48aa53e49d8202.zip
Support byo etcd for calico
Diffstat (limited to 'roles/calico/tasks/main.yml')
-rw-r--r--roles/calico/tasks/main.yml39
1 files changed, 28 insertions, 11 deletions
diff --git a/roles/calico/tasks/main.yml b/roles/calico/tasks/main.yml
index fa5e338b3..8a7a61dc9 100644
--- a/roles/calico/tasks/main.yml
+++ b/roles/calico/tasks/main.yml
@@ -1,19 +1,36 @@
---
-- include: ../../../roles/etcd_client_certificates/tasks/main.yml
- 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 }}"
+- name: Calico Node | Error if invalid cert arguments
+ fail:
+ msg: "Must provide all or none for the following etcd params: calico_etcd_cert_dir, calico_etcd_ca_cert_file, calico_etcd_cert_file, calico_etcd_key_file, calico_etcd_endpoints"
+ when: (calico_etcd_cert_dir is defined or calico_etcd_ca_cert_file is defined or calico_etcd_cert_file is defined or calico_etcd_key_file is defined or calico_etcd_endpoints is defined) and not (calico_etcd_cert_dir is defined and calico_etcd_ca_cert_file is defined and calico_etcd_cert_file is defined and calico_etcd_key_file is defined and calico_etcd_endpoints is defined)
-- name: Calico Node | Assure the calico certs have been generated
+- name: Calico Node | Generate certs if not provided
+ include: gen_certs.yml
+ when: item is not defined
+ with_items:
+ - calico_etcd_ca_cert_file
+ - calico_etcd_cert_file
+ - calico_etcd_key_file
+ - calico_etcd_endpoints
+ - calico_etcd_cert_dir
+
+- name: Calico Node | Error if no certs set.
+ fail:
+ msg: "Invalid etcd configuration for calico."
+ when: item is not defined or item == ''
+ with_items:
+ - calico_etcd_ca_cert_file
+ - calico_etcd_cert_file
+ - calico_etcd_key_file
+ - calico_etcd_endpoints
+
+- name: Calico Node | Assure the calico certs are present
stat:
path: "{{ item }}"
with_items:
- - "{{ calico_etcd_ca_cert_file }}"
- - "{{ calico_etcd_cert_file}}"
- - "{{ calico_etcd_key_file }}"
+ - "{{ calico_etcd_ca_cert_file }}"
+ - "{{ calico_etcd_cert_file}}"
+ - "{{ calico_etcd_key_file }}"
- name: Calico Node | Configure Calico service unit file
template: