diff options
| author | Sylvain Baubeau <sbaubeau@redhat.com> | 2015-10-13 16:36:01 +0200 |
|---|---|---|
| committer | Sylvain Baubeau <sbaubeau@redhat.com> | 2015-10-27 17:42:56 +0100 |
| commit | 2a7131b9403a4b22ebc55606814f604f723dc826 (patch) | |
| tree | 0930790b4718d3bcfb96da8fb7cc65072e280f64 /playbooks | |
| parent | f450c935f69366a15e078ec11b82bfa0c7130f6d (diff) | |
| download | openshift-2a7131b9403a4b22ebc55606814f604f723dc826.tar.gz openshift-2a7131b9403a4b22ebc55606814f604f723dc826.tar.bz2 openshift-2a7131b9403a4b22ebc55606814f604f723dc826.tar.xz openshift-2a7131b9403a4b22ebc55606814f604f723dc826.zip | |
Add flannel support
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 8 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 1dec923fc..54d61da06 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -247,6 +247,14 @@ when: ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and (osm_use_cockpit | bool or osm_use_cockpit is undefined ) +- name: Configure flannel + hosts: oo_first_master + vars: + etcd_urls: "{{ openshift.master.etcd_urls }}" + roles: + - role: flannel_register + when: openshift.common.use_flannel | bool + # Additional instance config for online deployments - name: Additional instance config hosts: oo_masters_deployment_type_online diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index a14ca8e11..e39e9164c 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -84,6 +84,7 @@ vars: sync_tmpdir: "{{ hostvars.localhost.mktemp.stdout }}" openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}" + etcd_urls: "{{ hostvars[groups.oo_first_master.0].openshift.master.etcd_urls }}" pre_tasks: - name: Ensure certificate directory exists file: @@ -100,6 +101,8 @@ when: certs_missing roles: - openshift_node + - role: flannel + when: openshift.common.use_flannel | bool - role: nickhammond.logrotate - role: fluentd_node when: openshift.common.use_fluentd | bool |