diff options
| author | Sylvain Baubeau <sbaubeau@redhat.com> | 2015-10-15 10:39:29 +0200 |
|---|---|---|
| committer | Sylvain Baubeau <sbaubeau@redhat.com> | 2015-10-27 17:42:56 +0100 |
| commit | 4d915db61a7ebfeab72e0c649f0ea34a0281b596 (patch) | |
| tree | 188d0be0129be21e7a65c0d0e526206a352c305c /roles | |
| parent | 68e09d87fd859d8ec41b5eef5c44b4b39e732ba2 (diff) | |
| download | openshift-4d915db61a7ebfeab72e0c649f0ea34a0281b596.tar.gz openshift-4d915db61a7ebfeab72e0c649f0ea34a0281b596.tar.bz2 openshift-4d915db61a7ebfeab72e0c649f0ea34a0281b596.tar.xz openshift-4d915db61a7ebfeab72e0c649f0ea34a0281b596.zip | |
Remove multiple use_flannel fact definition
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 11 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index da20d4f96..94eb73346 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -14,10 +14,7 @@ - name: Set master facts openshift_facts: - role: "{{ item.role }}" - local_facts: "{{ item.local_facts }}" - with_items: - - role: master + role: master local_facts: cluster_hostname: "{{ openshift_master_cluster_hostname | default(None) }}" cluster_public_hostname: "{{ openshift_master_cluster_public_hostname | default(None) }}" @@ -65,12 +62,6 @@ 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 diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index cb92a8d4e..98271c8b3 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -20,7 +20,6 @@ hostname: "{{ openshift_hostname | default(none) }}" public_hostname: "{{ openshift_public_hostname | default(none) }}" deployment_type: "{{ openshift_deployment_type }}" - use_flannel: "{{ openshift_use_flannel | default(None) }}" - role: node local_facts: labels: "{{ lookup('oo_option', 'openshift_node_labels') | default( openshift_node_labels | default(none), true) }}" |