Cleanup bin, test and roles/openshift_ansible_inventory following move to openshift-tools

5 files changed, 0 insertions, 300 deletions

diff --git a/bin/openshift_ansible/__init__.py b/bin/openshift_ansible/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/bin/openshift_ansible/__init__.py
+++ /dev/null
diff --git a/bin/openshift_ansible/aws b/bin/openshift_ansible/aws
deleted file mode 120000
index eb0575b4d..000000000
--- a/bin/openshift_ansible/aws
+++ /dev/null
@@ -1 +0,0 @@
-../../inventory/aws/
\ No newline at end of file
diff --git a/bin/openshift_ansible/awsutil.py b/bin/openshift_ansible/awsutil.py
deleted file mode 100644
index 11651f087..000000000
--- a/bin/openshift_ansible/awsutil.py
+++ /dev/null
@@ -1,268 +0,0 @@
-# vim: expandtab:tabstop=4:shiftwidth=4
-
-"""This module comprises Aws specific utility functions."""
-
-import os
-import re
-
-# Buildbot does not have multi_inventory installed
-#pylint: disable=no-name-in-module
-from openshift_ansible import multi_inventory
-
-class ArgumentError(Exception):
-    """This class is raised when improper arguments are passed."""
-
-    def __init__(self, message):
-        """Initialize an ArgumentError.
-
-        Keyword arguments:
-        message -- the exact error message being raised
-        """
-        super(ArgumentError, self).__init__()
-        self.message = message
-
-class AwsUtil(object):
-    """This class contains the AWS utility functions."""
-
-    def __init__(self, host_type_aliases=None):
-        """Initialize the AWS utility class.
-
-        Keyword arguments:
-        host_type_aliases -- a list of aliases to common host-types (e.g. ex-node)
-        """
-
-        self.alias_lookup = {}
-        host_type_aliases = host_type_aliases or {}
-
-        self.host_type_aliases = host_type_aliases
-        self.file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)))
-
-        self.setup_host_type_alias_lookup()
-
-    def setup_host_type_alias_lookup(self):
-        """Sets up the alias to host-type lookup table."""
-        for key, values in self.host_type_aliases.iteritems():
-            for value in values:
-                self.alias_lookup[value] = key
-
-    @staticmethod
-    def get_inventory(args=None, cached=False):
-        """Calls the inventory script and returns a dictionary containing the inventory."
-
-        Keyword arguments:
-        args -- optional arguments to pass to the inventory script
-        """
-        minv = multi_inventory.MultiInventory(args)
-        if cached:
-            minv.get_inventory_from_cache()
-        else:
-            minv.run()
-        return minv.result
-
-    def get_clusters(self):
-        """Searches for cluster tags in the inventory and returns all of the clusters found."""
-        pattern = re.compile(r'^oo_clusterid_(.*)')
-
-        clusters = []
-        inv = self.get_inventory()
-        for key in inv.keys():
-            matched = pattern.match(key)
-            if matched:
-                clusters.append(matched.group(1))
-
-        clusters.sort()
-        return clusters
-
-    def get_environments(self):
-        """Searches for env tags in the inventory and returns all of the envs found."""
-        pattern = re.compile(r'^oo_environment_(.*)')
-
-        envs = []
-        inv = self.get_inventory()
-        for key in inv.keys():
-            matched = pattern.match(key)
-            if matched:
-                envs.append(matched.group(1))
-
-        envs.sort()
-        return envs
-
-    def get_host_types(self):
-        """Searches for host-type tags in the inventory and returns all host-types found."""
-        pattern = re.compile(r'^oo_hosttype_(.*)')
-
-        host_types = []
-        inv = self.get_inventory()
-        for key in inv.keys():
-            matched = pattern.match(key)
-            if matched:
-                host_types.append(matched.group(1))
-
-        host_types.sort()
-        return host_types
-
-    def get_sub_host_types(self):
-        """Searches for sub-host-type tags in the inventory and returns all sub-host-types found."""
-        pattern = re.compile(r'^oo_subhosttype_(.*)')
-
-        sub_host_types = []
-        inv = self.get_inventory()
-        for key in inv.keys():
-            matched = pattern.match(key)
-            if matched:
-                sub_host_types.append(matched.group(1))
-
-        sub_host_types.sort()
-        return sub_host_types
-
-    def get_security_groups(self):
-        """Searches for security_groups in the inventory and returns all SGs found."""
-        pattern = re.compile(r'^security_group_(.*)')
-
-        groups = []
-        inv = self.get_inventory()
-        for key in inv.keys():
-            matched = pattern.match(key)
-            if matched:
-                groups.append(matched.group(1))
-
-        groups.sort()
-        return groups
-
-    def build_host_dict_by_env(self, args=None):
-        """Searches the inventory for hosts in an env and returns their hostvars."""
-        args = args or []
-        inv = self.get_inventory(args)
-
-        inst_by_env = {}
-        for _, host in inv['_meta']['hostvars'].items():
-            # If you don't have an environment tag, we're going to ignore you
-            if 'oo_environment' not in host:
-                continue
-
-            if host['oo_environment'] not in inst_by_env:
-                inst_by_env[host['oo_environment']] = {}
-            host_id = "%s:%s" % (host['oo_name'], host['oo_id'])
-            inst_by_env[host['oo_environment']][host_id] = host
-
-        return inst_by_env
-
-    def print_host_types(self):
-        """Gets the list of host types and aliases and outputs them in columns."""
-        host_types = self.get_host_types()
-        ht_format_str = "%35s"
-        alias_format_str = "%-20s"
-        combined_format_str = ht_format_str + "    " + alias_format_str
-
-        print
-        print combined_format_str % ('Host Types', 'Aliases')
-        print combined_format_str % ('----------', '-------')
-
-        for host_type in host_types:
-            aliases = []
-            if host_type in self.host_type_aliases:
-                aliases = self.host_type_aliases[host_type]
-                print combined_format_str % (host_type, ", ".join(aliases))
-            else:
-                print  ht_format_str % host_type
-        print
-
-    def resolve_host_type(self, host_type):
-        """Converts a host-type alias into a host-type.
-
-        Keyword arguments:
-        host_type -- The alias or host_type to look up.
-
-        Example (depends on aliases defined in config file):
-            host_type = ex-node
-            returns: openshift-node
-        """
-        if self.alias_lookup.has_key(host_type):
-            return self.alias_lookup[host_type]
-        return host_type
-
-    @staticmethod
-    def gen_version_tag(ver):
-        """Generate the version tag
-        """
-        return "oo_version_%s" % ver
-
-    @staticmethod
-    def gen_clusterid_tag(clu):
-        """Generate the clusterid tag
-        """
-        return "oo_clusterid_%s" % clu
-
-    @staticmethod
-    def gen_env_tag(env):
-        """Generate the environment tag
-        """
-        return "oo_environment_%s" % env
-
-    def gen_host_type_tag(self, host_type, version):
-        """Generate the host type tag
-        """
-        if version == '2':
-            host_type = self.resolve_host_type(host_type)
-        return "oo_hosttype_%s" % host_type
-
-    @staticmethod
-    def gen_sub_host_type_tag(sub_host_type):
-        """Generate the host type tag
-        """
-        return "oo_subhosttype_%s" % sub_host_type
-
-    # This function uses all of these params to perform a filters on our host inventory.
-    # pylint: disable=too-many-arguments
-    def get_host_list(self, clusters=None, host_type=None, sub_host_type=None, envs=None, version=None, cached=False):
-        """Get the list of hosts from the inventory using host-type and environment
-        """
-        retval = set([])
-        envs = envs or []
-
-        inv = self.get_inventory(cached=cached)
-
-        retval.update(inv.get('all_hosts', []))
-
-        if clusters:
-            cluster_hosts = set([])
-            if len(clusters) > 1:
-                for cluster in clusters:
-                    clu_tag = AwsUtil.gen_clusterid_tag(cluster)
-                    cluster_hosts.update(inv.get(clu_tag, []))
-            else:
-                cluster_hosts.update(inv.get(AwsUtil.gen_clusterid_tag(clusters[0]), []))
-
-            retval.intersection_update(cluster_hosts)
-
-        if envs:
-            env_hosts = set([])
-            if len(envs) > 1:
-                for env in envs:
-                    env_tag = AwsUtil.gen_env_tag(env)
-                    env_hosts.update(inv.get(env_tag, []))
-            else:
-                env_hosts.update(inv.get(AwsUtil.gen_env_tag(envs[0]), []))
-
-            retval.intersection_update(env_hosts)
-
-        if host_type:
-            retval.intersection_update(inv.get(self.gen_host_type_tag(host_type, version), []))
-
-        if sub_host_type:
-            retval.intersection_update(inv.get(self.gen_sub_host_type_tag(sub_host_type), []))
-
-        if version != 'all':
-            retval.intersection_update(inv.get(AwsUtil.gen_version_tag(version), []))
-
-        return list(retval)
-
-    def convert_to_ip(self, hosts, cached=False):
-        """convert a list of host names to ip addresses"""
-
-        inv = self.get_inventory(cached=cached)
-        ips = []
-        for host in hosts:
-            ips.append(inv['_meta']['hostvars'][host]['oo_public_ip'])
-
-        return ips
diff --git a/bin/openshift_ansible/multi_inventory.py b/bin/openshift_ansible/multi_inventory.py
deleted file mode 120000
index b40feec07..000000000
--- a/bin/openshift_ansible/multi_inventory.py
+++ /dev/null
@@ -1 +0,0 @@
-../../inventory/multi_inventory.py
\ No newline at end of file
diff --git a/bin/openshift_ansible/utils.py b/bin/openshift_ansible/utils.py
deleted file mode 100644
index e6243aa5a..000000000
--- a/bin/openshift_ansible/utils.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-# vim: expandtab:tabstop=4:shiftwidth=4
-
-''' The purpose of this module is to contain small utility functions.
-'''
-
-import re
-
-def normalize_dnsname(name, padding=10):
-    ''' The purpose of this function is to return a dns name with zero padding,
-        so that it sorts properly (as a human would expect).
-
-        Example: name=ex-lrg-node10.prod.rhcloud.com
-        Returns: ex-lrg-node0000000010.prod.rhcloud.com
-
-        Example Usage:
-            sorted(['a3.example.com', 'a10.example.com', 'a1.example.com'],
-                   key=normalize_dnsname)
-
-        Returns: ['a1.example.com', 'a3.example.com', 'a10.example.com']
-    '''
-    parts = re.split(r'(\d+)', name)
-    retval = []
-    for part in parts:
-        if re.match(r'^\d+$', part):
-            retval.append(part.zfill(padding))
-        else:
-            retval.append(part)
-
-    return ''.join(retval)