Merge pull request #6456 from mgugino-upstream-stage/node-facts

Remove openshift_node_facts part 1

1 files changed, 2 insertions, 73 deletions

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index a10ba9310..58e64994f 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -536,8 +536,7 @@ def set_aggregate_facts(facts):
 
 def set_deployment_facts_if_unset(facts):
     """ Set Facts that vary based on deployment_type. This currently
-        includes master.registry_url, node.registry_url,
-        node.storage_plugin_deps
+        includes master.registry_url, node.registry_url
 
         Args:
             facts (dict): existing facts
@@ -564,11 +563,6 @@ def set_deployment_facts_if_unset(facts):
             if facts['common']['deployment_subtype'] == 'registry':
                 facts['master']['disabled_features'] = openshift_features
 
-    if 'node' in facts:
-        deployment_type = facts['common']['deployment_type']
-        if 'storage_plugin_deps' not in facts['node']:
-            facts['node']['storage_plugin_deps'] = ['ceph', 'glusterfs', 'iscsi']
-
     return facts
 
 
@@ -792,62 +786,6 @@ def get_current_config(facts):
     return current_config
 
 
-def build_kubelet_args(facts):
-    """Build node kubelet_args
-
-In the node-config.yaml file, kubeletArgument sub-keys have their
-values provided as a list. Hence the gratuitous use of ['foo'] below.
-    """
-    cloud_cfg_path = os.path.join(
-        facts['common']['config_base'],
-        'cloudprovider')
-
-    # We only have to do this stuff on hosts that are nodes
-    if 'node' in facts:
-        # Any changes to the kubeletArguments parameter are stored
-        # here first.
-        kubelet_args = {}
-
-        if 'cloudprovider' in facts:
-            # EVERY cloud is special <3
-            if 'kind' in facts['cloudprovider']:
-                if facts['cloudprovider']['kind'] == 'aws':
-                    kubelet_args['cloud-provider'] = ['aws']
-                    kubelet_args['cloud-config'] = [cloud_cfg_path + '/aws.conf']
-                if facts['cloudprovider']['kind'] == 'openstack':
-                    kubelet_args['cloud-provider'] = ['openstack']
-                    kubelet_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf']
-                if facts['cloudprovider']['kind'] == 'gce':
-                    kubelet_args['cloud-provider'] = ['gce']
-                    kubelet_args['cloud-config'] = [cloud_cfg_path + '/gce.conf']
-
-        # Automatically add node-labels to the kubeletArguments
-        # parameter. See BZ1359848 for additional details.
-        #
-        # Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1359848
-        if 'labels' in facts['node'] and isinstance(facts['node']['labels'], dict):
-            # tl;dr: os_node_labels="{'foo': 'bar', 'a': 'b'}" turns
-            # into ['foo=bar', 'a=b']
-            #
-            # On the openshift_node_labels inventory variable we loop
-            # over each key-value tuple (from .items()) and join the
-            # key to the value with an '=' character, this produces a
-            # list.
-            #
-            # map() seems to be returning an itertools.imap object
-            # instead of a list. We cast it to a list ourselves.
-            # pylint: disable=unnecessary-lambda
-            labels_str = list(map(lambda x: '='.join(x), facts['node']['labels'].items()))
-            if labels_str != '':
-                kubelet_args['node-labels'] = labels_str
-
-        # If we've added items to the kubelet_args dict then we need
-        # to merge the new items back into the main facts object.
-        if kubelet_args != {}:
-            facts = merge_facts({'node': {'kubelet_args': kubelet_args}}, facts, [])
-    return facts
-
-
 def build_controller_args(facts):
     """ Build master controller_args """
     cloud_cfg_path = os.path.join(facts['common']['config_base'],
@@ -1367,7 +1305,6 @@ def set_container_facts_if_unset(facts):
     deployment_type = facts['common']['deployment_type']
     if deployment_type == 'openshift-enterprise':
         master_image = 'openshift3/ose'
-        node_image = 'openshift3/node'
         ovs_image = 'openshift3/openvswitch'
         pod_image = 'openshift3/ose-pod'
         router_image = 'openshift3/ose-haproxy-router'
@@ -1375,7 +1312,6 @@ def set_container_facts_if_unset(facts):
         deployer_image = 'openshift3/ose-deployer'
     else:
         master_image = 'openshift/origin'
-        node_image = 'openshift/node'
         ovs_image = 'openshift/openvswitch'
         pod_image = 'openshift/origin-pod'
         router_image = 'openshift/origin-haproxy-router'
@@ -1398,9 +1334,6 @@ def set_container_facts_if_unset(facts):
         facts['master']['master_image'] = master_image
         facts['master']['master_system_image'] = master_image
     if 'node' in facts:
-        if 'node_image' not in facts['node']:
-            facts['node']['node_image'] = node_image
-            facts['node']['node_system_image'] = node_image
         if 'ovs_image' not in facts['node']:
             facts['node']['ovs_image'] = ovs_image
             facts['node']['ovs_system_image'] = ovs_image
@@ -1545,7 +1478,6 @@ class OpenShiftFacts(object):
         facts = set_deployment_facts_if_unset(facts)
         facts = set_sdn_facts_if_unset(facts, self.system_facts)
         facts = set_container_facts_if_unset(facts)
-        facts = build_kubelet_args(facts)
         facts = build_controller_args(facts)
         facts = build_api_server_args(facts)
         facts = set_version_facts_if_unset(facts)
@@ -1607,10 +1539,7 @@ class OpenShiftFacts(object):
                                       max_requests_inflight=500)
 
         if 'node' in roles:
-            defaults['node'] = dict(labels={}, annotations={},
-                                    iptables_sync_period='30s',
-                                    local_quota_per_fsgroup="",
-                                    set_node_ip=False)
+            defaults['node'] = dict(labels={}, annotations={})
 
         if 'cloudprovider' in roles:
             defaults['cloudprovider'] = dict(kind=None)