Browse Source

Remove multiple use_flannel fact definition

Sylvain Baubeau 9 years ago
parent
commit
4d915db61a
2 changed files with 1 additions and 11 deletions
  1. 1 10
      roles/openshift_master/tasks/main.yml
  2. 0 1
      roles/openshift_node/tasks/main.yml

+ 1 - 10
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

+ 0 - 1
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) }}"