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 /roles/openshift_master/tasks | |
| 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 'roles/openshift_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 94eb73346..da20d4f96 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -14,7 +14,10 @@ - name: Set master facts openshift_facts: - role: master + role: "{{ item.role }}" + local_facts: "{{ item.local_facts }}" + with_items: + - role: master local_facts: cluster_hostname: "{{ openshift_master_cluster_hostname | default(None) }}" cluster_public_hostname: "{{ openshift_master_cluster_public_hostname | default(None) }}" @@ -62,6 +65,12 @@ api_server_args: "{{ osm_api_server_args | default(None) }}" controller_args: "{{ osm_controller_args | default(None) }}" infra_nodes: "{{ num_infra | default(None) }}" + - role: common + local_facts: + hostname: "{{ openshift_hostname | default(none) }}" + public_hostname: "{{ openshift_public_hostname | default(none) }}" + deployment_type: "{{ openshift_deployment_type }}" + use_flannel: "{{ openshift_use_flannel | default(None) }}" - name: Install Master package yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=present |