Merge pull request #6614 from mgugino-upstream-stage/plugins-to-lib-utils

Move more plugins to lib_utils

4 files changed, 4 insertions, 74 deletions

diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml
index 71de24339..8c8227b5e 100644
--- a/roles/openshift_aws/defaults/main.yml
+++ b/roles/openshift_aws/defaults/main.yml
@@ -109,6 +109,7 @@ openshift_aws_node_group_config_node_volumes:
   device_type: gp2
   delete_on_termination: True
 
+# build_instance_tags is a custom filter in role lib_utils
 openshift_aws_node_group_config_tags: "{{ openshift_aws_clusterid | build_instance_tags }}"
 openshift_aws_node_group_termination_policy: Default
 openshift_aws_node_group_replace_instances: []
@@ -201,6 +202,7 @@ openshift_aws_node_group_config:
 openshift_aws_elb_tags: "{{ openshift_aws_kube_tags }}"
 openshift_aws_elb_az_load_balancing: False
 
+# build_instance_tags is a custom filter in role lib_utils
 openshift_aws_kube_tags: "{{ openshift_aws_clusterid | build_instance_tags }}"
 
 openshift_aws_elb_security_groups: "{{ openshift_aws_launch_config_security_groups }}"
diff --git a/roles/openshift_aws/filter_plugins/openshift_aws_filters.py b/roles/openshift_aws/filter_plugins/openshift_aws_filters.py
deleted file mode 100644
index dfcb11da3..000000000
--- a/roles/openshift_aws/filter_plugins/openshift_aws_filters.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-'''
-Custom filters for use in openshift_aws
-'''
-
-from ansible import errors
-
-
-class FilterModule(object):
-    ''' Custom ansible filters for use by openshift_aws role'''
-
-    @staticmethod
-    def scale_groups_serial(scale_group_info, upgrade=False):
-        ''' This function will determine what the deployment serial should be and return it
-
-          Search through the tags and find the deployment_serial tag. Once found,
-          determine if an increment is needed during an upgrade.
-          if upgrade is true then increment the serial and return it
-          else return the serial
-        '''
-        if scale_group_info == []:
-            return 1
-
-        scale_group_info = scale_group_info[0]
-
-        if not isinstance(scale_group_info, dict):
-            raise errors.AnsibleFilterError("|filter plugin failed: Expected scale_group_info to be a dict")
-
-        serial = None
-
-        for tag in scale_group_info['tags']:
-            if tag['key'] == 'deployment_serial':
-                serial = int(tag['value'])
-                if upgrade:
-                    serial += 1
-                break
-        else:
-            raise errors.AnsibleFilterError("|filter plugin failed: deployment_serial tag was not found")
-
-        return serial
-
-    @staticmethod
-    def scale_groups_match_capacity(scale_group_info):
-        ''' This function will verify that the scale group instance count matches
-            the scale group desired capacity
-
-        '''
-        for scale_group in scale_group_info:
-            if scale_group['desired_capacity'] != len(scale_group['instances']):
-                return False
-
-        return True
-
-    @staticmethod
-    def build_instance_tags(clusterid):
-        ''' This function will return a dictionary of the instance tags.
-
-            The main desire to have this inside of a filter_plugin is that we
-            need to build the following key.
-
-            {"kubernetes.io/cluster/{{ openshift_aws_clusterid }}": "{{ openshift_aws_clusterid}}"}
-
-        '''
-        tags = {'clusterid': clusterid,
-                'kubernetes.io/cluster/{}'.format(clusterid): clusterid}
-
-        return tags
-
-    def filters(self):
-        ''' returns a mapping of filters to methods '''
-        return {'build_instance_tags': self.build_instance_tags,
-                'scale_groups_match_capacity': self.scale_groups_match_capacity,
-                'scale_groups_serial': self.scale_groups_serial}
diff --git a/roles/openshift_aws/tasks/build_node_group.yml b/roles/openshift_aws/tasks/build_node_group.yml
index 9485cc3ac..a9f9cc3c4 100644
--- a/roles/openshift_aws/tasks/build_node_group.yml
+++ b/roles/openshift_aws/tasks/build_node_group.yml
@@ -43,6 +43,7 @@
 
 - name: set the value for the deployment_serial and the current asgs
   set_fact:
+    # scale_groups_serial is a custom filter in role lib_utils
     l_deployment_serial: "{{  openshift_aws_node_group_deployment_serial if openshift_aws_node_group_deployment_serial is defined else asgs.results | scale_groups_serial(openshift_aws_node_group_upgrade) }}"
     openshift_aws_current_asgs: "{{ asgs.results | map(attribute='auto_scaling_group_name') | list | union(openshift_aws_current_asgs) }}"
 
diff --git a/roles/openshift_aws/tasks/wait_for_groups.yml b/roles/openshift_aws/tasks/wait_for_groups.yml
index 1f4ef3e1c..3ad876e37 100644
--- a/roles/openshift_aws/tasks/wait_for_groups.yml
+++ b/roles/openshift_aws/tasks/wait_for_groups.yml
@@ -8,6 +8,7 @@
     tags:
       "{{ {'kubernetes.io/cluster/' ~ openshift_aws_clusterid: openshift_aws_clusterid } }}"
   register: qasg
+  # scale_groups_match_capacity is a custom filter in role lib_utils
   until: qasg | json_query('results[*]') | scale_groups_match_capacity | bool
   delay: 10
   retries: 60