cleanup roles after roles move to openshift-tools

also removing inventory/multi_inventory*

things left behind unchanged even though they were copied:
playbooks/adhoc/*
roles/dns
roles/kube_nfs_volumes
roles/os_update_latest

22 files changed, 0 insertions, 4792 deletions

diff --git a/roles/lib_zabbix/README.md b/roles/lib_zabbix/README.md
deleted file mode 100644
index 69debc698..000000000
--- a/roles/lib_zabbix/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-zabbix
-=========
-
-Automate zabbix tasks.
-
-Requirements
-------------
-
-This requires the openshift_tools rpm be installed for the zbxapi.py library.  It can be found here: https://github.com/openshift/openshift-tools under openshift_tools/monitoring/zbxapi.py for now.
-
-Role Variables
---------------
-
-None
-
-Dependencies
-------------
-
-This depeonds on the zbxapi.py library located here: https://github.com/openshift/openshift-tools under openshift_tools/monitoring/zbxapi.py for now.
-
-Example Playbook
-----------------
-
-  - zbx_host:
-      server: zab_server
-      user: zab_user
-      password: zab_password
-      name: 'myhost'
-
-License
--------
-
-ASL 2.0
-
-Author Information
-------------------
-
-OpenShift operations, Red Hat, Inc
diff --git a/roles/lib_zabbix/library/__init__.py b/roles/lib_zabbix/library/__init__.py
deleted file mode 100644
index 0c7e19e41..000000000
--- a/roles/lib_zabbix/library/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-'''
-ZabbixAPI ansible module
-'''
diff --git a/roles/lib_zabbix/library/zbx_action.py b/roles/lib_zabbix/library/zbx_action.py
deleted file mode 100644
index 499084942..000000000
--- a/roles/lib_zabbix/library/zbx_action.py
+++ /dev/null
@@ -1,690 +0,0 @@
-#!/usr/bin/env python
-# vim: expandtab:tabstop=4:shiftwidth=4
-'''
- Ansible module for zabbix actions
-'''
-#
-#   Zabbix action ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection, ZabbixAPIError
-
-CUSTOM_SCRIPT_ACTION = '0'
-IPMI_ACTION = '1'
-SSH_ACTION = '2'
-TELNET_ACTION = '3'
-GLOBAL_SCRIPT_ACTION = '4'
-
-EXECUTE_ON_ZABBIX_AGENT = '0'
-EXECUTE_ON_ZABBIX_SERVER = '1'
-
-OPERATION_REMOTE_COMMAND = '1'
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def conditions_equal(zab_conditions, user_conditions):
-    '''Compare two lists of conditions'''
-    c_type = 'conditiontype'
-    _op = 'operator'
-    val = 'value'
-    if len(user_conditions) != len(zab_conditions):
-        return False
-
-    for zab_cond, user_cond in zip(zab_conditions, user_conditions):
-        if zab_cond[c_type] != str(user_cond[c_type]) or zab_cond[_op] != str(user_cond[_op]) or \
-           zab_cond[val] != str(user_cond[val]):
-            return False
-
-    return True
-
-def filter_differences(zabbix_filters, user_filters):
-    '''Determine the differences from user and zabbix for operations'''
-    rval = {}
-    for key, val in user_filters.items():
-
-        if key == 'conditions':
-            if not conditions_equal(zabbix_filters[key], val):
-                rval[key] = val
-
-        elif zabbix_filters[key] != str(val):
-            rval[key] = val
-
-    return rval
-
-def opconditions_diff(zab_val, user_val):
-    ''' Report whether there are differences between opconditions on
-        zabbix and opconditions supplied by user '''
-
-    if len(zab_val) != len(user_val):
-        return True
-
-    for z_cond, u_cond in zip(zab_val, user_val):
-        if not all([str(u_cond[op_key]) == z_cond[op_key] for op_key in \
-                    ['conditiontype', 'operator', 'value']]):
-            return True
-
-    return False
-
-def opmessage_diff(zab_val, user_val):
-    ''' Report whether there are differences between opmessage on
-        zabbix and opmessage supplied by user '''
-
-    for op_msg_key, op_msg_val in user_val.items():
-        if zab_val[op_msg_key] != str(op_msg_val):
-            return True
-
-    return False
-
-def opmessage_grp_diff(zab_val, user_val):
-    ''' Report whether there are differences between opmessage_grp
-        on zabbix and opmessage_grp supplied by user '''
-
-    zab_grp_ids = set([ugrp['usrgrpid'] for ugrp in zab_val])
-    usr_grp_ids = set([ugrp['usrgrpid'] for ugrp in user_val])
-    if usr_grp_ids != zab_grp_ids:
-        return True
-
-    return False
-
-def opmessage_usr_diff(zab_val, user_val):
-    ''' Report whether there are differences between opmessage_usr
-        on zabbix and opmessage_usr supplied by user '''
-
-    zab_usr_ids = set([usr['userid'] for usr in zab_val])
-    usr_ids = set([usr['userid'] for usr in user_val])
-    if usr_ids != zab_usr_ids:
-        return True
-
-    return False
-
-def opcommand_diff(zab_op_cmd, usr_op_cmd):
-    ''' Check whether user-provided opcommand matches what's already
-        stored in Zabbix '''
-
-    for usr_op_cmd_key, usr_op_cmd_val in usr_op_cmd.items():
-        if zab_op_cmd[usr_op_cmd_key] != str(usr_op_cmd_val):
-            return True
-    return False
-
-def host_in_zabbix(zab_hosts, usr_host):
-    ''' Check whether a particular user host is already in the
-        Zabbix list of hosts '''
-
-    for usr_hst_key, usr_hst_val in usr_host.items():
-        for zab_host in zab_hosts:
-            if usr_hst_key in zab_host and \
-               zab_host[usr_hst_key] == str(usr_hst_val):
-                return True
-
-    return False
-
-def hostlist_in_zabbix(zab_hosts, usr_hosts):
-    ''' Check whether user-provided list of hosts are already in
-        the Zabbix action '''
-
-    if len(zab_hosts) != len(usr_hosts):
-        return False
-
-    for usr_host in usr_hosts:
-        if not host_in_zabbix(zab_hosts, usr_host):
-            return False
-
-    return True
-
-# We are comparing two lists of dictionaries (the one stored on zabbix and the
-# one the user is providing). For each type of operation, determine whether there
-# is a difference between what is stored on zabbix and what the user is providing.
-# If there is a difference, we take the user-provided data for what needs to
-# be stored/updated into zabbix.
-def operation_differences(zabbix_ops, user_ops):
-    '''Determine the differences from user and zabbix for operations'''
-
-    # if they don't match, take the user options
-    if len(zabbix_ops) != len(user_ops):
-        return user_ops
-
-    rval = {}
-    for zab, user in zip(zabbix_ops, user_ops):
-        for oper in user.keys():
-            if oper == 'opconditions' and opconditions_diff(zab[oper], \
-                                                                user[oper]):
-                rval[oper] = user[oper]
-
-            elif oper == 'opmessage' and opmessage_diff(zab[oper], \
-                                                        user[oper]):
-                rval[oper] = user[oper]
-
-            elif oper == 'opmessage_grp' and opmessage_grp_diff(zab[oper], \
-                                                                user[oper]):
-                rval[oper] = user[oper]
-
-            elif oper == 'opmessage_usr' and opmessage_usr_diff(zab[oper], \
-                                                                user[oper]):
-                rval[oper] = user[oper]
-
-            elif oper == 'opcommand' and opcommand_diff(zab[oper], \
-                                                        user[oper]):
-                rval[oper] = user[oper]
-
-            # opcommand_grp can be treated just like opcommand_hst
-            # as opcommand_grp[] is just a list of groups
-            elif oper == 'opcommand_hst' or oper == 'opcommand_grp':
-                if not hostlist_in_zabbix(zab[oper], user[oper]):
-                    rval[oper] = user[oper]
-
-            # if it's any other type of operation than the ones tested above
-            # just do a direct compare
-            elif oper not in ['opconditions', 'opmessage', 'opmessage_grp',
-                              'opmessage_usr', 'opcommand', 'opcommand_hst',
-                              'opcommand_grp'] \
-                        and str(zab[oper]) != str(user[oper]):
-                rval[oper] = user[oper]
-
-    return rval
-
-def get_users(zapi, users):
-    '''get the mediatype id from the mediatype name'''
-    rval_users = []
-
-    for user in users:
-        content = zapi.get_content('user',
-                                   'get',
-                                   {'filter': {'alias': user}})
-        rval_users.append({'userid': content['result'][0]['userid']})
-
-    return rval_users
-
-def get_user_groups(zapi, groups):
-    '''get the mediatype id from the mediatype name'''
-    user_groups = []
-
-    for group in groups:
-        content = zapi.get_content('usergroup',
-                                   'get',
-                                   {'search': {'name': group}})
-        for result in content['result']:
-            user_groups.append({'usrgrpid': result['usrgrpid']})
-
-    return user_groups
-
-def get_mediatype_id_by_name(zapi, m_name):
-    '''get the mediatype id from the mediatype name'''
-    content = zapi.get_content('mediatype',
-                               'get',
-                               {'filter': {'description': m_name}})
-
-    return content['result'][0]['mediatypeid']
-
-def get_priority(priority):
-    ''' determine priority
-    '''
-    prior = 0
-    if 'info' in priority:
-        prior = 1
-    elif 'warn' in priority:
-        prior = 2
-    elif 'avg' == priority or 'ave' in priority:
-        prior = 3
-    elif 'high' in priority:
-        prior = 4
-    elif 'dis' in priority:
-        prior = 5
-
-    return prior
-
-def get_event_source(from_src):
-    '''Translate even str into value'''
-    choices = ['trigger', 'discovery', 'auto', 'internal']
-    rval = 0
-    try:
-        rval = choices.index(from_src)
-    except ValueError as _:
-        ZabbixAPIError('Value not found for event source [%s]' % from_src)
-
-    return rval
-
-def get_status(inc_status):
-    '''determine status for action'''
-    rval = 1
-    if inc_status == 'enabled':
-        rval = 0
-
-    return rval
-
-def get_condition_operator(inc_operator):
-    ''' determine the condition operator'''
-    vals = {'=': 0,
-            '<>': 1,
-            'like': 2,
-            'not like': 3,
-            'in': 4,
-            '>=': 5,
-            '<=': 6,
-            'not in': 7,
-           }
-
-    return vals[inc_operator]
-
-def get_host_id_by_name(zapi, host_name):
-    '''Get host id by name'''
-    content = zapi.get_content('host',
-                               'get',
-                               {'filter': {'name': host_name}})
-
-    return content['result'][0]['hostid']
-
-def get_trigger_value(inc_trigger):
-    '''determine the proper trigger value'''
-    rval = 1
-    if inc_trigger == 'PROBLEM':
-        rval = 1
-    else:
-        rval = 0
-
-    return rval
-
-def get_template_id_by_name(zapi, t_name):
-    '''get the template id by name'''
-    content = zapi.get_content('template',
-                               'get',
-                               {'filter': {'host': t_name}})
-
-    return content['result'][0]['templateid']
-
-
-def get_host_group_id_by_name(zapi, hg_name):
-    '''Get hostgroup id by name'''
-    content = zapi.get_content('hostgroup',
-                               'get',
-                               {'filter': {'name': hg_name}})
-
-    return content['result'][0]['groupid']
-
-def get_condition_type(event_source, inc_condition):
-    '''determine the condition type'''
-    c_types = {}
-    if event_source == 'trigger':
-        c_types = {'host group': 0,
-                   'host': 1,
-                   'trigger': 2,
-                   'trigger name': 3,
-                   'trigger severity': 4,
-                   'trigger value': 5,
-                   'time period': 6,
-                   'host template': 13,
-                   'application': 15,
-                   'maintenance status': 16,
-                  }
-
-    elif event_source == 'discovery':
-        c_types = {'host IP': 7,
-                   'discovered service type': 8,
-                   'discovered service port': 9,
-                   'discovery status': 10,
-                   'uptime or downtime duration': 11,
-                   'received value': 12,
-                   'discovery rule': 18,
-                   'discovery check': 19,
-                   'proxy': 20,
-                   'discovery object': 21,
-                  }
-
-    elif event_source == 'auto':
-        c_types = {'proxy': 20,
-                   'host name': 22,
-                   'host metadata': 24,
-                  }
-
-    elif event_source == 'internal':
-        c_types = {'host group': 0,
-                   'host': 1,
-                   'host template': 13,
-                   'application': 15,
-                   'event type': 23,
-                  }
-    else:
-        raise ZabbixAPIError('Unkown event source %s' % event_source)
-
-    return c_types[inc_condition]
-
-def get_operation_type(inc_operation):
-    ''' determine the correct operation type'''
-    o_types = {'send message': 0,
-               'remote command': OPERATION_REMOTE_COMMAND,
-               'add host': 2,
-               'remove host': 3,
-               'add to host group': 4,
-               'remove from host group': 5,
-               'link to template': 6,
-               'unlink from template': 7,
-               'enable host': 8,
-               'disable host': 9,
-              }
-
-    return o_types[inc_operation]
-
-def get_opcommand_type(opcommand_type):
-    ''' determine the opcommand type '''
-    oc_types = {'custom script': CUSTOM_SCRIPT_ACTION,
-                'IPMI': IPMI_ACTION,
-                'SSH': SSH_ACTION,
-                'Telnet': TELNET_ACTION,
-                'global script': GLOBAL_SCRIPT_ACTION,
-               }
-
-    return oc_types[opcommand_type]
-
-def get_execute_on(execute_on):
-    ''' determine the execution target '''
-    e_types = {'zabbix agent': EXECUTE_ON_ZABBIX_AGENT,
-               'zabbix server': EXECUTE_ON_ZABBIX_SERVER,
-              }
-
-    return e_types[execute_on]
-
-def action_remote_command(ansible_module, zapi, operation):
-    ''' Process remote command type of actions '''
-
-    if 'type' not in operation['opcommand']:
-        ansible_module.exit_json(failed=True, changed=False, state='unknown',
-                                 results="No Operation Type provided")
-
-    operation['opcommand']['type'] = get_opcommand_type(operation['opcommand']['type'])
-
-    if operation['opcommand']['type'] == CUSTOM_SCRIPT_ACTION:
-
-        if 'execute_on' in operation['opcommand']:
-            operation['opcommand']['execute_on'] = get_execute_on(operation['opcommand']['execute_on'])
-
-        # custom script still requires the target hosts/groups to be set
-        operation['opcommand_hst'] = []
-        operation['opcommand_grp'] = []
-        for usr_host in operation['target_hosts']:
-            if usr_host['target_type'] == 'zabbix server':
-                # 0 = target host local/current host
-                operation['opcommand_hst'].append({'hostid': 0})
-            elif usr_host['target_type'] == 'group':
-                group_name = usr_host['target']
-                gid = get_host_group_id_by_name(zapi, group_name)
-                operation['opcommand_grp'].append({'groupid': gid})
-            elif usr_host['target_type'] == 'host':
-                host_name = usr_host['target']
-                hid = get_host_id_by_name(zapi, host_name)
-                operation['opcommand_hst'].append({'hostid': hid})
-
-        # 'target_hosts' is just to make it easier to build zbx_actions
-        # not part of ZabbixAPI
-        del operation['target_hosts']
-    else:
-        ansible_module.exit_json(failed=True, changed=False, state='unknown',
-                                 results="Unsupported remote command type")
-
-
-def get_action_operations(ansible_module, zapi, inc_operations):
-    '''Convert the operations into syntax for api'''
-    for operation in inc_operations:
-        operation['operationtype'] = get_operation_type(operation['operationtype'])
-        if operation['operationtype'] == 0: # send message.  Need to fix the
-            operation['opmessage']['mediatypeid'] = \
-             get_mediatype_id_by_name(zapi, operation['opmessage']['mediatypeid'])
-            operation['opmessage_grp'] = get_user_groups(zapi, operation.get('opmessage_grp', []))
-            operation['opmessage_usr'] = get_users(zapi, operation.get('opmessage_usr', []))
-            if operation['opmessage']['default_msg']:
-                operation['opmessage']['default_msg'] = 1
-            else:
-                operation['opmessage']['default_msg'] = 0
-
-        elif operation['operationtype'] == OPERATION_REMOTE_COMMAND:
-            action_remote_command(ansible_module, zapi, operation)
-
-        # Handle Operation conditions:
-        # Currently there is only 1 available which
-        # is 'event acknowledged'.  In the future
-        # if there are any added we will need to pass this
-        # option to a function and return the correct conditiontype
-        if operation.has_key('opconditions'):
-            for condition in operation['opconditions']:
-                if condition['conditiontype'] == 'event acknowledged':
-                    condition['conditiontype'] = 14
-
-                if condition['operator'] == '=':
-                    condition['operator'] = 0
-
-                if condition['value'] == 'acknowledged':
-                    condition['value'] = 1
-                else:
-                    condition['value'] = 0
-
-
-    return inc_operations
-
-def get_operation_evaltype(inc_type):
-    '''get the operation evaltype'''
-    rval = 0
-    if inc_type == 'and/or':
-        rval = 0
-    elif inc_type == 'and':
-        rval = 1
-    elif inc_type == 'or':
-        rval = 2
-    elif inc_type == 'custom':
-        rval = 3
-
-    return rval
-
-def get_action_conditions(zapi, event_source, inc_conditions):
-    '''Convert the conditions into syntax for api'''
-
-    calc_type = inc_conditions.pop('calculation_type')
-    inc_conditions['evaltype'] = get_operation_evaltype(calc_type)
-    for cond in inc_conditions['conditions']:
-
-        cond['operator'] = get_condition_operator(cond['operator'])
-        # Based on conditiontype we need to set the proper value
-        # e.g. conditiontype = hostgroup then the value needs to be a hostgroup id
-        # e.g. conditiontype = host the value needs to be a host id
-        cond['conditiontype'] = get_condition_type(event_source, cond['conditiontype'])
-        if cond['conditiontype'] == 0:
-            cond['value'] = get_host_group_id_by_name(zapi, cond['value'])
-        elif cond['conditiontype'] == 1:
-            cond['value'] = get_host_id_by_name(zapi, cond['value'])
-        elif cond['conditiontype'] == 4:
-            cond['value'] = get_priority(cond['value'])
-
-        elif cond['conditiontype'] == 5:
-            cond['value'] = get_trigger_value(cond['value'])
-        elif cond['conditiontype'] == 13:
-            cond['value'] = get_template_id_by_name(zapi, cond['value'])
-        elif cond['conditiontype'] == 16:
-            cond['value'] = ''
-
-    return inc_conditions
-
-
-def get_send_recovery(send_recovery):
-    '''Get the integer value'''
-    rval = 0
-    if send_recovery:
-        rval = 1
-
-    return rval
-
-# The branches are needed for CRUD and error handling
-# pylint: disable=too-many-branches
-def main():
-    '''
-    ansible zabbix module for zbx_item
-    '''
-
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-
-            name=dict(default=None, type='str'),
-            event_source=dict(default='trigger', choices=['trigger', 'discovery', 'auto', 'internal'], type='str'),
-            action_subject=dict(default="{TRIGGER.NAME}: {TRIGGER.STATUS}", type='str'),
-            action_message=dict(default="{TRIGGER.NAME}: {TRIGGER.STATUS}\r\n" +
-                                "Last value: {ITEM.LASTVALUE}\r\n\r\n{TRIGGER.URL}", type='str'),
-            reply_subject=dict(default="{TRIGGER.NAME}: {TRIGGER.STATUS}", type='str'),
-            reply_message=dict(default="Trigger: {TRIGGER.NAME}\r\nTrigger status: {TRIGGER.STATUS}\r\n" +
-                               "Trigger severity: {TRIGGER.SEVERITY}\r\nTrigger URL: {TRIGGER.URL}\r\n\r\n" +
-                               "Item values:\r\n\r\n1. {ITEM.NAME1} ({HOST.NAME1}:{ITEM.KEY1}): " +
-                               "{ITEM.VALUE1}\r\n2. {ITEM.NAME2} ({HOST.NAME2}:{ITEM.KEY2}): " +
-                               "{ITEM.VALUE2}\r\n3. {ITEM.NAME3} ({HOST.NAME3}:{ITEM.KEY3}): " +
-                               "{ITEM.VALUE3}", type='str'),
-            send_recovery=dict(default=False, type='bool'),
-            status=dict(default=None, type='str'),
-            escalation_time=dict(default=60, type='int'),
-            conditions_filter=dict(default=None, type='dict'),
-            operations=dict(default=None, type='list'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'action'
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'name': module.params['name']},
-                                'selectFilter': 'extend',
-                                'selectOperations': 'extend',
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['actionid']])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        conditions = get_action_conditions(zapi, module.params['event_source'], module.params['conditions_filter'])
-        operations = get_action_operations(module, zapi,
-                                           module.params['operations'])
-        params = {'name': module.params['name'],
-                  'esc_period': module.params['escalation_time'],
-                  'eventsource': get_event_source(module.params['event_source']),
-                  'status': get_status(module.params['status']),
-                  'def_shortdata': module.params['action_subject'],
-                  'def_longdata': module.params['action_message'],
-                  'r_shortdata': module.params['reply_subject'],
-                  'r_longdata': module.params['reply_message'],
-                  'recovery_msg': get_send_recovery(module.params['send_recovery']),
-                  'filter': conditions,
-                  'operations': operations,
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-
-        ########
-        # UPDATE
-        ########
-        _ = params.pop('hostid', None)
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'operations':
-                ops = operation_differences(zab_results[key], value)
-                if ops:
-                    differences[key] = ops
-
-            elif key == 'filter':
-                filters = filter_differences(zab_results[key], value)
-                if filters:
-                    differences[key] = filters
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update.
-        # action update requires an id, filters, and operations
-        differences['actionid'] = zab_results['actionid']
-        differences['operations'] = params['operations']
-        differences['filter'] = params['filter']
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_application.py b/roles/lib_zabbix/library/zbx_application.py
deleted file mode 100644
index 472390071..000000000
--- a/roles/lib_zabbix/library/zbx_application.py
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/usr/bin/env python
-'''
-Ansible module for application
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix application ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_template_ids(zapi, template_name):
-    '''
-    get related templates
-    '''
-    template_ids = []
-    # Fetch templates by name
-    content = zapi.get_content('template',
-                               'get',
-                               {'search': {'host': template_name}})
-    if content.has_key('result'):
-        template_ids.append(content['result'][0]['templateid'])
-    return template_ids
-
-def main():
-    ''' Ansible module for application
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str', required=True),
-            template_name=dict(default=None, type='str'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the application for the rest of the calls
-    zbx_class_name = 'application'
-    idname = 'applicationid'
-    aname = module.params['name']
-    state = module.params['state']
-    # get a applicationid, see if it exists
-    tids = get_template_ids(zapi, module.params['template_name'])
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'name': aname},
-                                'templateids': tids[0],
-                               })
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    if state == 'present':
-        params = {'hostid': tids[0],
-                  'name': aname,
-                 }
-
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-            module.exit_json(changed=True, results=content['result'], state='present')
-        # already exists, we need to update it
-        # let's compare properties
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-            if key == 'templates' and zab_results.has_key('parentTemplates'):
-                if zab_results['parentTemplates'] != value:
-                    differences[key] = value
-            elif zab_results[key] != str(value) and zab_results[key] != value:
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=content['result'], state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_discoveryrule.py b/roles/lib_zabbix/library/zbx_discoveryrule.py
deleted file mode 100644
index 7c5f98397..000000000
--- a/roles/lib_zabbix/library/zbx_discoveryrule.py
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/usr/bin/env python
-'''
-Zabbix discovery rule ansible module
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_template(zapi, template_name):
-    '''get a template by name
-    '''
-    content = zapi.get_content('template',
-                               'get',
-                               {'search': {'host': template_name},
-                                'output': 'extend',
-                                'selectInterfaces': 'interfaceid',
-                               })
-    if not content['result']:
-        return None
-    return content['result'][0]
-
-def get_type(vtype):
-    '''
-    Determine which type of discoverrule this is
-    '''
-    _types = {'agent': 0,
-              'SNMPv1': 1,
-              'trapper': 2,
-              'simple': 3,
-              'SNMPv2': 4,
-              'internal': 5,
-              'SNMPv3': 6,
-              'active': 7,
-              'external': 10,
-              'database monitor': 11,
-              'ipmi': 12,
-              'ssh': 13,
-              'telnet': 14,
-              'JMX': 16,
-             }
-
-    for typ in _types.keys():
-        if vtype in typ or vtype == typ:
-            _vtype = _types[typ]
-            break
-    else:
-        _vtype = 2
-
-    return _vtype
-
-def main():
-    '''
-    Ansible module for zabbix discovery rules
-    '''
-
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            key=dict(default=None, type='str'),
-            description=dict(default=None, type='str'),
-            interfaceid=dict(default=None, type='int'),
-            ztype=dict(default='trapper', type='str'),
-            delay=dict(default=60, type='int'),
-            lifetime=dict(default=30, type='int'),
-            template_name=dict(default=[], type='list'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'discoveryrule'
-    idname = "itemid"
-    dname = module.params['name']
-    state = module.params['state']
-    template = get_template(zapi, module.params['template_name'])
-
-    # selectInterfaces doesn't appear to be working but is needed.
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'name': dname},
-                                'templateids': template['templateid'],
-                                #'selectDServices': 'extend',
-                                #'selectDChecks': 'extend',
-                                #'selectDhosts': 'dhostid',
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-
-    # Create and Update
-    if state == 'present':
-        params = {'name': dname,
-                  'key_':  module.params['key'],
-                  'hostid':  template['templateid'],
-                  'interfaceid': module.params['interfaceid'],
-                  'lifetime': module.params['lifetime'],
-                  'type': get_type(module.params['ztype']),
-                  'description': module.params['description'],
-                 }
-        if params['type'] in [2, 5, 7, 11]:
-            params.pop('interfaceid')
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-        ########
-        # UPDATE
-        ########
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_graph.py b/roles/lib_zabbix/library/zbx_graph.py
deleted file mode 100644
index 71f4e1264..000000000
--- a/roles/lib_zabbix/library/zbx_graph.py
+++ /dev/null
@@ -1,331 +0,0 @@
-#!/usr/bin/env python
-'''
- Ansible module for zabbix graphs
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix graphs ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-#---
-#- hosts: localhost
-#  gather_facts: no
-#  tasks:
-#  - zbx_graph:
-#      zbx_server: https://zabbixserver/zabbix/api_jsonrpc.php
-#      zbx_user: Admin
-#      zbx_password: zabbix
-#      name: Test Graph
-#      height: 300
-#      width: 500
-#      graph_items:
-#      - item_name: openshift.master.etcd.create.fail
-#        color: red
-#        line_style: bold
-#      - item_name: openshift.master.etcd.create.success
-#        color: red
-#        line_style: bold
-#
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_graph_type(graphtype):
-    '''
-    Possible values:
-    0 - normal;
-    1 - stacked;
-    2 - pie;
-    3 - exploded;
-    '''
-    gtype = 0
-    if 'stacked' in graphtype:
-        gtype = 1
-    elif 'pie' in graphtype:
-        gtype = 2
-    elif 'exploded' in graphtype:
-        gtype = 3
-
-    return gtype
-
-def get_show_legend(show_legend):
-    '''Get the value for show_legend
-       0 - hide
-       1 - (default) show
-    '''
-    rval = 1
-    if 'hide' == show_legend:
-        rval = 0
-
-    return rval
-
-def get_template_id(zapi, template_name):
-    '''
-    get related templates
-    '''
-    # Fetch templates by name
-    content = zapi.get_content('template',
-                               'get',
-                               {'filter': {'host': template_name},})
-
-    if content.has_key('result'):
-        return content['result'][0]['templateid']
-
-    return None
-
-def get_color(color_in):
-    ''' Receive a color and translate it to a hex representation of the color
-
-        Will have a few setup by default
-    '''
-    colors = {'black': '000000',
-              'red': 'FF0000',
-              'pink': 'FFC0CB',
-              'purple': '800080',
-              'orange': 'FFA500',
-              'gold': 'FFD700',
-              'yellow': 'FFFF00',
-              'green': '008000',
-              'cyan': '00FFFF',
-              'aqua': '00FFFF',
-              'blue': '0000FF',
-              'brown': 'A52A2A',
-              'gray': '808080',
-              'grey': '808080',
-              'silver': 'C0C0C0',
-             }
-    if colors.has_key(color_in):
-        return colors[color_in]
-
-    return color_in
-
-def get_line_style(style):
-    '''determine the line style
-    '''
-    line_style = {'line': 0,
-                  'filled': 1,
-                  'bold': 2,
-                  'dot': 3,
-                  'dashed': 4,
-                  'gradient': 5,
-                 }
-
-    if line_style.has_key(style):
-        return line_style[style]
-
-    return 0
-
-def get_calc_function(func):
-    '''Determine the caclulation function'''
-    rval = 2 # default to avg
-    if 'min' in func:
-        rval = 1
-    elif 'max' in func:
-        rval = 4
-    elif 'all' in func:
-        rval = 7
-    elif 'last' in func:
-        rval = 9
-
-    return rval
-
-def get_graph_item_type(gtype):
-    '''Determine the graph item type
-    '''
-    rval = 0 # simple graph type
-    if 'sum' in gtype:
-        rval = 2
-
-    return rval
-
-def get_graph_items(zapi, gitems):
-    '''Get graph items by id'''
-
-    r_items = []
-    for item in gitems:
-        content = zapi.get_content('item',
-                                   'get',
-                                   {'filter': {'name': item['item_name']}})
-        _ = item.pop('item_name')
-        color = get_color(item.pop('color'))
-        drawtype = get_line_style(item.get('line_style', 'line'))
-        func = get_calc_function(item.get('calc_func', 'avg'))
-        g_type = get_graph_item_type(item.get('graph_item_type', 'simple'))
-
-        if content.has_key('result'):
-            tmp = {'itemid': content['result'][0]['itemid'],
-                   'color': color,
-                   'drawtype': drawtype,
-                   'calc_fnc': func,
-                   'type': g_type,
-                  }
-            r_items.append(tmp)
-
-    return r_items
-
-def compare_gitems(zabbix_items, user_items):
-    '''Compare zabbix results with the user's supplied items
-       return True if user_items are equal
-       return False if any of the values differ
-    '''
-    if len(zabbix_items) != len(user_items):
-        return False
-
-    for u_item in user_items:
-        for z_item in zabbix_items:
-            if u_item['itemid'] == z_item['itemid']:
-                if not all([str(value) == z_item[key] for key, value in u_item.items()]):
-                    return False
-
-    return True
-
-# The branches are needed for CRUD and error handling
-# pylint: disable=too-many-branches
-def main():
-    '''
-    ansible zabbix module for zbx_graphs
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            height=dict(default=None, type='int'),
-            width=dict(default=None, type='int'),
-            graph_type=dict(default='normal', type='str'),
-            show_legend=dict(default='show', type='str'),
-            state=dict(default='present', type='str'),
-            graph_items=dict(default=None, type='list'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'graph'
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'filter': {'name': module.params['name']},
-                                #'templateids': templateid,
-                                'selectGraphItems': 'extend',
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['graphid']])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        params = {'name': module.params['name'],
-                  'height': module.params['height'],
-                  'width': module.params['width'],
-                  'graphtype': get_graph_type(module.params['graph_type']),
-                  'show_legend': get_show_legend(module.params['show_legend']),
-                  'gitems': get_graph_items(zapi, module.params['graph_items']),
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-
-        ########
-        # UPDATE
-        ########
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'gitems':
-                if not compare_gitems(zab_results[key], value):
-                    differences[key] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences['graphid'] = zab_results['graphid']
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_graphprototype.py b/roles/lib_zabbix/library/zbx_graphprototype.py
deleted file mode 100644
index d63873b00..000000000
--- a/roles/lib_zabbix/library/zbx_graphprototype.py
+++ /dev/null
@@ -1,331 +0,0 @@
-#!/usr/bin/env python
-'''
- Ansible module for zabbix graphprototypes
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix graphprototypes ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-#---
-#- hosts: localhost
-#  gather_facts: no
-#  tasks:
-#  - zbx_graphprototype:
-#      zbx_server: https://zabbixserver/zabbix/api_jsonrpc.php
-#      zbx_user: Admin
-#      zbx_password: zabbix
-#      name: Test Graph
-#      height: 300
-#      width: 500
-#      graph_items:
-#      - item_name: Bytes per second IN on network interface {#OSO_NET_INTERFACE}
-#        color: red
-#        line_style: bold
-#        item_type: prototype
-#      - item_name: Template OS Linux: Bytes per second OUT on network interface {#OSO_NET_INTERFACE}
-#        item_type: prototype
-#
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_graph_type(graphtype):
-    '''
-    Possible values:
-    0 - normal;
-    1 - stacked;
-    2 - pie;
-    3 - exploded;
-    '''
-    gtype = 0
-    if 'stacked' in graphtype:
-        gtype = 1
-    elif 'pie' in graphtype:
-        gtype = 2
-    elif 'exploded' in graphtype:
-        gtype = 3
-
-    return gtype
-
-def get_show_legend(show_legend):
-    '''Get the value for show_legend
-       0 - hide
-       1 - (default) show
-    '''
-    rval = 1
-    if 'hide' == show_legend:
-        rval = 0
-
-    return rval
-
-def get_template_id(zapi, template_name):
-    '''
-    get related templates
-    '''
-    # Fetch templates by name
-    content = zapi.get_content('template',
-                               'get',
-                               {'filter': {'host': template_name},})
-
-    if content.has_key('result'):
-        return content['result'][0]['templateid']
-
-    return None
-
-def get_color(color_in='black'):
-    ''' Receive a color and translate it to a hex representation of the color
-
-        Will have a few setup by default
-    '''
-    colors = {'black': '000000',
-              'red': 'FF0000',
-              'pink': 'FFC0CB',
-              'purple': '800080',
-              'orange': 'FFA500',
-              'gold': 'FFD700',
-              'yellow': 'FFFF00',
-              'green': '008000',
-              'cyan': '00FFFF',
-              'aqua': '00FFFF',
-              'blue': '0000FF',
-              'brown': 'A52A2A',
-              'gray': '808080',
-              'grey': '808080',
-              'silver': 'C0C0C0',
-             }
-    if colors.has_key(color_in):
-        return colors[color_in]
-
-    return color_in
-
-def get_line_style(style):
-    '''determine the line style
-    '''
-    line_style = {'line': 0,
-                  'filled': 1,
-                  'bold': 2,
-                  'dot': 3,
-                  'dashed': 4,
-                  'gradient': 5,
-                 }
-
-    if line_style.has_key(style):
-        return line_style[style]
-
-    return 0
-
-def get_calc_function(func):
-    '''Determine the caclulation function'''
-    rval = 2 # default to avg
-    if 'min' in func:
-        rval = 1
-    elif 'max' in func:
-        rval = 4
-    elif 'all' in func:
-        rval = 7
-    elif 'last' in func:
-        rval = 9
-
-    return rval
-
-def get_graph_item_type(gtype):
-    '''Determine the graph item type
-    '''
-    rval = 0 # simple graph type
-    if 'sum' in gtype:
-        rval = 2
-
-    return rval
-
-def get_graph_items(zapi, gitems):
-    '''Get graph items by id'''
-
-    r_items = []
-    for item in gitems:
-        content = zapi.get_content('item%s' % item.get('item_type', ''),
-                                   'get',
-                                   {'filter': {'name': item['item_name']}})
-        _ = item.pop('item_name')
-        color = get_color(item.pop('color', 'black'))
-        drawtype = get_line_style(item.get('line_style', 'line'))
-        func = get_calc_function(item.get('calc_func', 'avg'))
-        g_type = get_graph_item_type(item.get('graph_item_type', 'simple'))
-
-        if content.has_key('result'):
-            tmp = {'itemid': content['result'][0]['itemid'],
-                   'color': color,
-                   'drawtype': drawtype,
-                   'calc_fnc': func,
-                   'type': g_type,
-                  }
-            r_items.append(tmp)
-
-    return r_items
-
-def compare_gitems(zabbix_items, user_items):
-    '''Compare zabbix results with the user's supplied items
-       return True if user_items are equal
-       return False if any of the values differ
-    '''
-    if len(zabbix_items) != len(user_items):
-        return False
-
-    for u_item in user_items:
-        for z_item in zabbix_items:
-            if u_item['itemid'] == z_item['itemid']:
-                if not all([str(value) == z_item[key] for key, value in u_item.items()]):
-                    return False
-
-    return True
-
-# The branches are needed for CRUD and error handling
-# pylint: disable=too-many-branches
-def main():
-    '''
-    ansible zabbix module for zbx_graphprototypes
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            height=dict(default=None, type='int'),
-            width=dict(default=None, type='int'),
-            graph_type=dict(default='normal', type='str'),
-            show_legend=dict(default='show', type='str'),
-            state=dict(default='present', type='str'),
-            graph_items=dict(default=None, type='list'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'graphprototype'
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'filter': {'name': module.params['name']},
-                                #'templateids': templateid,
-                                'selectGraphItems': 'extend',
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['graphid']])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        params = {'name': module.params['name'],
-                  'height': module.params['height'],
-                  'width': module.params['width'],
-                  'graphtype': get_graph_type(module.params['graph_type']),
-                  'show_legend': get_show_legend(module.params['show_legend']),
-                  'gitems': get_graph_items(zapi, module.params['graph_items']),
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-
-        ########
-        # UPDATE
-        ########
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'gitems':
-                if not compare_gitems(zab_results[key], value):
-                    differences[key] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences['graphid'] = zab_results['graphid']
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_host.py b/roles/lib_zabbix/library/zbx_host.py
deleted file mode 100644
index bbeec49ff..000000000
--- a/roles/lib_zabbix/library/zbx_host.py
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/usr/bin/env python
-'''
-Zabbix host ansible module
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_group_ids(zapi, hostgroup_names):
-    '''
-    get hostgroups
-    '''
-    # Fetch groups by name
-    group_ids = []
-    for hgr in hostgroup_names:
-        content = zapi.get_content('hostgroup', 'get', {'search': {'name': hgr}})
-        if content.has_key('result'):
-            group_ids.append({'groupid': content['result'][0]['groupid']})
-
-    return group_ids
-
-def get_template_ids(zapi, template_names):
-    '''
-    get related templates
-    '''
-    template_ids = []
-    # Fetch templates by name
-    for template_name in template_names:
-        content = zapi.get_content('template', 'get', {'search': {'host': template_name}})
-        if content.has_key('result'):
-            template_ids.append({'templateid': content['result'][0]['templateid']})
-    return template_ids
-
-def interfaces_equal(zbx_interfaces, user_interfaces):
-    '''
-    compare interfaces from zabbix and interfaces from user
-    '''
-
-    for u_int in user_interfaces:
-        for z_int in zbx_interfaces:
-            for u_key, u_val in u_int.items():
-                if str(z_int[u_key]) != str(u_val):
-                    return False
-
-    return True
-
-def main():
-    '''
-    Ansible module for zabbix host
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            hostgroup_names=dict(default=[], type='list'),
-            template_names=dict(default=[], type='list'),
-            state=dict(default='present', type='str'),
-            interfaces=dict(default=None, type='list'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'host'
-    idname = "hostid"
-    hname = module.params['name']
-    state = module.params['state']
-
-    # selectInterfaces doesn't appear to be working but is needed.
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'host': hname},
-                                'selectGroups': 'groupid',
-                                'selectParentTemplates': 'templateid',
-                                'selectInterfaces': 'interfaceid',
-                               })
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    if state == 'present':
-        ifs = module.params['interfaces'] or [{'type':  1,         # interface type, 1 = agent
-                                               'main':  1,         # default interface? 1 = true
-                                               'useip':  1,        # default interface? 1 = true
-                                               'ip':  '127.0.0.1', # default interface? 1 = true
-                                               'dns':  '',         # dns for host
-                                               'port':  '10050',   # port for interface? 10050
-                                              }]
-        hostgroup_names = list(set(module.params['hostgroup_names']))
-        params = {'host': hname,
-                  'groups':  get_group_ids(zapi, hostgroup_names),
-                  'templates':  get_template_ids(zapi, module.params['template_names']),
-                  'interfaces': ifs,
-                 }
-
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-            module.exit_json(changed=True, results=content['result'], state='present')
-        # already exists, we need to update it
-        # let's compare properties
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'templates' and zab_results.has_key('parentTemplates'):
-                if zab_results['parentTemplates'] != value:
-                    differences[key] = value
-
-
-            elif key == "interfaces":
-                if not interfaces_equal(zab_results[key], value):
-                    differences[key] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_hostgroup.py b/roles/lib_zabbix/library/zbx_hostgroup.py
deleted file mode 100644
index 6c57d727e..000000000
--- a/roles/lib_zabbix/library/zbx_hostgroup.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env python
-''' Ansible module for hostgroup
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix hostgroup ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def main():
-    ''' ansible module for hostgroup
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'hostgroup'
-    idname = "groupid"
-    hname = module.params['name']
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'name': hname},
-                               })
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    if state == 'present':
-        params = {'name': hname}
-
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-            module.exit_json(changed=True, results=content['result'], state='present')
-        # already exists, we need to update it
-        # let's compare properties
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-            if zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_httptest.py b/roles/lib_zabbix/library/zbx_httptest.py
deleted file mode 100644
index eab45d06e..000000000
--- a/roles/lib_zabbix/library/zbx_httptest.py
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/usr/bin/env python
-'''
- Ansible module for zabbix httpservice
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix item ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_authentication_method(auth):
-    ''' determine authentication type'''
-    rval = 0
-    if 'basic' in auth:
-        rval = 1
-    elif 'ntlm' in auth:
-        rval = 2
-
-    return rval
-
-def get_verify_host(verify):
-    '''
-    get the values for verify_host
-    '''
-    if verify:
-        return 1
-
-    return 0
-
-def get_app_id(zapi, application):
-    '''
-    get related templates
-    '''
-    # Fetch templates by name
-    content = zapi.get_content('application',
-                               'get',
-                               {'search': {'name': application},
-                                'selectApplications': ['applicationid', 'name']})
-    if content.has_key('result'):
-        return content['result'][0]['applicationid']
-
-    return None
-
-def get_template_id(zapi, template_name):
-    '''
-    get related templates
-    '''
-    # Fetch templates by name
-    content = zapi.get_content('template',
-                               'get',
-                               {'search': {'host': template_name},
-                                'selectApplications': ['applicationid', 'name']})
-    if content.has_key('result'):
-        return content['result'][0]['templateid']
-
-    return None
-
-def get_host_id_by_name(zapi, host_name):
-    '''Get host id by name'''
-    content = zapi.get_content('host',
-                               'get',
-                               {'filter': {'name': host_name}})
-
-    return content['result'][0]['hostid']
-
-def get_status(status):
-    ''' Determine the status of the web scenario  '''
-    rval = 0
-    if 'disabled' in status:
-        return 1
-
-    return rval
-
-def find_step(idx, step_list):
-    ''' find step by index '''
-    for step in step_list:
-        if str(step['no']) == str(idx):
-            return step
-
-    return None
-
-def steps_equal(zab_steps, user_steps):
-    '''compare steps returned from zabbix
-       and steps passed from user
-    '''
-
-    if len(user_steps) != len(zab_steps):
-        return False
-
-    for idx in range(1, len(user_steps)+1):
-
-        user = find_step(idx, user_steps)
-        zab = find_step(idx, zab_steps)
-
-        for key, value in user.items():
-            if str(value) != str(zab[key]):
-                return False
-
-    return True
-
-def process_steps(steps):
-    '''Preprocess the step parameters'''
-    for idx, step in enumerate(steps):
-        if not step.has_key('no'):
-            step['no'] = idx + 1
-
-    return steps
-
-# The branches are needed for CRUD and error handling
-# pylint: disable=too-many-branches
-def main():
-    '''
-    ansible zabbix module for zbx_item
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, require=True, type='str'),
-            agent=dict(default=None, type='str'),
-            template_name=dict(default=None, type='str'),
-            host_name=dict(default=None, type='str'),
-            interval=dict(default=60, type='int'),
-            application=dict(default=None, type='str'),
-            authentication=dict(default=None, type='str'),
-            http_user=dict(default=None, type='str'),
-            http_password=dict(default=None, type='str'),
-            state=dict(default='present', type='str'),
-            status=dict(default='enabled', type='str'),
-            steps=dict(default='present', type='list'),
-            verify_host=dict(default=False, type='bool'),
-            retries=dict(default=1, type='int'),
-            headers=dict(default=None, type='dict'),
-            query_type=dict(default='filter', choices=['filter', 'search'], type='str'),
-        ),
-        #supports_check_mode=True
-        mutually_exclusive=[['template_name', 'host_name']],
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'httptest'
-    state = module.params['state']
-    hostid = None
-
-    # If a template name was passed then accept the template
-    if module.params['template_name']:
-        hostid = get_template_id(zapi, module.params['template_name'])
-    else:
-        hostid = get_host_id_by_name(zapi, module.params['host_name'])
-
-    # Fail if a template was not found matching the name
-    if not hostid:
-        module.exit_json(failed=True,
-                         changed=False,
-                         results='Error: Could find template or host with name [%s].' %
-                         (module.params.get('template_name', module.params['host_name'])),
-                         state="Unkown")
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {module.params['query_type']: {'name': module.params['name']},
-                                'selectSteps': 'extend',
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['httptestid']])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        params = {'name': module.params['name'],
-                  'hostid': hostid,
-                  'agent': module.params['agent'],
-                  'retries': module.params['retries'],
-                  'steps': process_steps(module.params['steps']),
-                  'applicationid': get_app_id(zapi, module.params['application']),
-                  'delay': module.params['interval'],
-                  'verify_host': get_verify_host(module.params['verify_host']),
-                  'status': get_status(module.params['status']),
-                  'headers': module.params['headers'],
-                  'http_user': module.params['http_user'],
-                  'http_password': module.params['http_password'],
-                 }
-
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-
-        ########
-        # UPDATE
-        ########
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'steps':
-                if not steps_equal(zab_results[key], value):
-                    differences[key] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        # We have differences and need to update
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        differences['httptestid'] = zab_results['httptestid']
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_item.py b/roles/lib_zabbix/library/zbx_item.py
deleted file mode 100644
index 189485fb7..000000000
--- a/roles/lib_zabbix/library/zbx_item.py
+++ /dev/null
@@ -1,303 +0,0 @@
-#!/usr/bin/env python
-'''
- Ansible module for zabbix items
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix item ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_data_type(data_type):
-    '''
-    Possible values:
-    0 - decimal;
-    1 - octal;
-    2 - hexadecimal;
-    3 - bool;
-    '''
-    vtype = 0
-    if 'octal' in data_type:
-        vtype = 1
-    elif 'hexadecimal' in data_type:
-        vtype = 2
-    elif 'bool' in data_type:
-        vtype = 3
-
-    return vtype
-
-def get_value_type(value_type):
-    '''
-    Possible values:
-    0 - numeric float;
-    1 - character;
-    2 - log;
-    3 - numeric unsigned;
-    4 - text
-    '''
-    vtype = 0
-    if 'int' in value_type:
-        vtype = 3
-    elif 'log' in value_type:
-        vtype = 2
-    elif 'char' in value_type:
-        vtype = 1
-    elif 'str' in value_type:
-        vtype = 4
-
-    return vtype
-
-def get_app_ids(application_names, app_name_ids):
-    ''' get application ids from names
-    '''
-    applications = []
-    if application_names:
-        for app in application_names:
-            applications.append(app_name_ids[app])
-
-    return applications
-
-def get_template_id(zapi, template_name):
-    '''
-    get related templates
-    '''
-    template_ids = []
-    app_ids = {}
-    # Fetch templates by name
-    content = zapi.get_content('template',
-                               'get',
-                               {'search': {'host': template_name},
-                                'selectApplications': ['applicationid', 'name']})
-    if content.has_key('result'):
-        template_ids.append(content['result'][0]['templateid'])
-        for app in content['result'][0]['applications']:
-            app_ids[app['name']] = app['applicationid']
-
-    return template_ids, app_ids
-
-def get_multiplier(inval):
-    ''' Determine the multiplier
-    '''
-    if inval == None or inval == '':
-        return None, 0
-
-    rval = None
-    try:
-        rval = int(inval)
-    except ValueError:
-        pass
-
-    if rval:
-        return rval, 1
-
-    return rval, 0
-
-def get_zabbix_type(ztype):
-    '''
-    Determine which type of discoverrule this is
-    '''
-    _types = {'agent': 0,
-              'SNMPv1': 1,
-              'trapper': 2,
-              'simple': 3,
-              'SNMPv2': 4,
-              'internal': 5,
-              'SNMPv3': 6,
-              'active': 7,
-              'aggregate': 8,
-              'web': 9,
-              'external': 10,
-              'database monitor': 11,
-              'ipmi': 12,
-              'ssh': 13,
-              'telnet': 14,
-              'calculated': 15,
-              'JMX': 16,
-              'SNMP trap': 17,
-             }
-
-    for typ in _types.keys():
-        if ztype in typ or ztype == typ:
-            _vtype = _types[typ]
-            break
-    else:
-        _vtype = 2
-
-    return _vtype
-
-# The branches are needed for CRUD and error handling
-# pylint: disable=too-many-branches
-def main():
-    '''
-    ansible zabbix module for zbx_item
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            key=dict(default=None, type='str'),
-            template_name=dict(default=None, type='str'),
-            zabbix_type=dict(default='trapper', type='str'),
-            value_type=dict(default='int', type='str'),
-            data_type=dict(default='decimal', type='str'),
-            interval=dict(default=60, type='int'),
-            delta=dict(default=0, type='int'),
-            multiplier=dict(default=None, type='str'),
-            description=dict(default=None, type='str'),
-            units=dict(default=None, type='str'),
-            applications=dict(default=None, type='list'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'item'
-    state = module.params['state']
-
-    templateid, app_name_ids = get_template_id(zapi, module.params['template_name'])
-
-    # Fail if a template was not found matching the name
-    if not templateid:
-        module.exit_json(failed=True,
-                         changed=False,
-                         results='Error: Could find template with name %s for item.' % module.params['template_name'],
-                         state="Unkown")
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'key_': module.params['key']},
-                                'selectApplications': 'applicationid',
-                                'templateids': templateid,
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['itemid']])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        formula, use_multiplier = get_multiplier(module.params['multiplier'])
-        params = {'name': module.params.get('name', module.params['key']),
-                  'key_': module.params['key'],
-                  'hostid': templateid[0],
-                  'type': get_zabbix_type(module.params['zabbix_type']),
-                  'value_type': get_value_type(module.params['value_type']),
-                  'data_type': get_data_type(module.params['data_type']),
-                  'applications': get_app_ids(module.params['applications'], app_name_ids),
-                  'formula': formula,
-                  'multiplier': use_multiplier,
-                  'description': module.params['description'],
-                  'units': module.params['units'],
-                  'delay': module.params['interval'],
-                  'delta': module.params['delta'],
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-
-        ########
-        # UPDATE
-        ########
-        _ = params.pop('hostid', None)
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'applications':
-                app_ids = [item['applicationid'] for item in zab_results[key]]
-                if set(app_ids) != set(value):
-                    differences[key] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences['itemid'] = zab_results['itemid']
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_itemprototype.py b/roles/lib_zabbix/library/zbx_itemprototype.py
deleted file mode 100644
index eab2a04ae..000000000
--- a/roles/lib_zabbix/library/zbx_itemprototype.py
+++ /dev/null
@@ -1,327 +0,0 @@
-#!/usr/bin/env python
-'''
-Zabbix discovery rule ansible module
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_rule_id(zapi, discoveryrule_key, templateid):
-    '''get a discoveryrule by name
-    '''
-    content = zapi.get_content('discoveryrule',
-                               'get',
-                               {'search': {'key_': discoveryrule_key},
-                                'output': 'extend',
-                                'templateids': templateid,
-                               })
-    if not content['result']:
-        return None
-    return content['result'][0]['itemid']
-
-def get_template(zapi, template_name):
-    '''get a template by name
-    '''
-    if not template_name:
-        return None
-
-    content = zapi.get_content('template',
-                               'get',
-                               {'search': {'host': template_name},
-                                'output': 'extend',
-                                'selectInterfaces': 'interfaceid',
-                               })
-    if not content['result']:
-        return None
-    return content['result'][0]
-
-def get_multiplier(inval):
-    ''' Determine the multiplier
-    '''
-    if inval == None or inval == '':
-        return None, 0
-
-    rval = None
-    try:
-        rval = int(inval)
-    except ValueError:
-        pass
-
-    if rval:
-        return rval, 1
-
-    return rval, 0
-
-def get_zabbix_type(ztype):
-    '''
-    Determine which type of discoverrule this is
-    '''
-    _types = {'agent': 0,
-              'SNMPv1': 1,
-              'trapper': 2,
-              'simple': 3,
-              'SNMPv2': 4,
-              'internal': 5,
-              'SNMPv3': 6,
-              'active': 7,
-              'aggregate': 8,
-              'external': 10,
-              'database monitor': 11,
-              'ipmi': 12,
-              'ssh': 13,
-              'telnet': 14,
-              'calculated': 15,
-              'JMX': 16,
-              'SNMP trap': 17,
-             }
-
-    for typ in _types.keys():
-        if ztype in typ or ztype == typ:
-            _vtype = _types[typ]
-            break
-    else:
-        _vtype = 2
-
-    return _vtype
-
-def get_data_type(data_type):
-    '''
-    Possible values:
-    0 - decimal;
-    1 - octal;
-    2 - hexadecimal;
-    3 - bool;
-    '''
-    vtype = 0
-    if 'octal' in data_type:
-        vtype = 1
-    elif 'hexadecimal' in data_type:
-        vtype = 2
-    elif 'bool' in data_type:
-        vtype = 3
-
-    return vtype
-
-def get_value_type(value_type):
-    '''
-    Possible values:
-    0 - numeric float;
-    1 - character;
-    2 - log;
-    3 - numeric unsigned;
-    4 - text
-    '''
-    vtype = 0
-    if 'int' in value_type:
-        vtype = 3
-    elif 'char' in value_type:
-        vtype = 1
-    elif 'str' in value_type:
-        vtype = 4
-
-    return vtype
-
-def get_status(status):
-    ''' Determine status
-    '''
-    _status = 0
-    if status == 'disabled':
-        _status = 1
-    elif status == 'unsupported':
-        _status = 3
-
-    return _status
-
-def get_app_ids(zapi, application_names, templateid):
-    ''' get application ids from names
-    '''
-    app_ids = []
-    for app_name in application_names:
-        content = zapi.get_content('application', 'get', {'filter': {'name': app_name}, 'templateids': templateid})
-        if content.has_key('result'):
-            app_ids.append(content['result'][0]['applicationid'])
-    return app_ids
-
-# pylint: disable=too-many-branches
-def main():
-    '''
-    Ansible module for zabbix discovery rules
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            key=dict(default=None, type='str'),
-            description=dict(default=None, type='str'),
-            template_name=dict(default=None, type='str'),
-            interfaceid=dict(default=None, type='int'),
-            zabbix_type=dict(default='trapper', type='str'),
-            value_type=dict(default='float', type='str'),
-            data_type=dict(default='decimal', type='str'),
-            delay=dict(default=60, type='int'),
-            lifetime=dict(default=30, type='int'),
-            state=dict(default='present', type='str'),
-            status=dict(default='enabled', type='str'),
-            applications=dict(default=[], type='list'),
-            discoveryrule_key=dict(default=None, type='str'),
-            interval=dict(default=60, type='int'),
-            delta=dict(default=0, type='int'),
-            multiplier=dict(default=None, type='str'),
-            units=dict(default=None, type='str'),
-
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'itemprototype'
-    idname = "itemid"
-    state = module.params['state']
-    template = get_template(zapi, module.params['template_name'])
-
-    # selectInterfaces doesn't appear to be working but is needed.
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'key_': module.params['key']},
-                                'selectApplications': 'applicationid',
-                                'selectDiscoveryRule': 'itemid',
-                                'templated': True,
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        formula, use_multiplier = get_multiplier(module.params['multiplier'])
-
-        params = {'name': module.params['name'],
-                  'key_':  module.params['key'],
-                  'hostid':  template['templateid'],
-                  'interfaceid': module.params['interfaceid'],
-                  'ruleid': get_rule_id(zapi, module.params['discoveryrule_key'], template['templateid']),
-                  'type': get_zabbix_type(module.params['zabbix_type']),
-                  'value_type': get_value_type(module.params['value_type']),
-                  'data_type': get_data_type(module.params['data_type']),
-                  'applications': get_app_ids(zapi, module.params['applications'], template['templateid']),
-                  'formula': formula,
-                  'multiplier': use_multiplier,
-                  'description': module.params['description'],
-                  'units': module.params['units'],
-                  'delay': module.params['interval'],
-                  'delta': module.params['delta'],
-                 }
-
-        if params['type'] in [2, 5, 7, 8, 11, 15]:
-            params.pop('interfaceid')
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-        #******#
-        # UPDATE
-        #******#
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'ruleid':
-                if value != zab_results['discoveryRule']['itemid']:
-                    differences[key] = value
-
-            elif key == 'applications':
-                app_ids = [app['applicationid'] for app in zab_results[key]]
-                if set(app_ids) - set(value):
-                    differences[key] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_itservice.py b/roles/lib_zabbix/library/zbx_itservice.py
deleted file mode 100644
index aa37f0a2b..000000000
--- a/roles/lib_zabbix/library/zbx_itservice.py
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/usr/bin/env python
-'''
- Ansible module for zabbix itservices
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix itservice ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_parent(dependencies):
-    '''Put dependencies into the proper update format'''
-    rval = None
-    for dep in dependencies:
-        if dep['relationship'] == 'parent':
-            return dep
-    return rval
-
-def format_dependencies(dependencies):
-    '''Put dependencies into the proper update format'''
-    rval = []
-    for dep in dependencies:
-        rval.append({'dependsOnServiceid': dep['serviceid'],
-                     'soft': get_dependency_type(dep['dep_type']),
-                    })
-
-    return rval
-
-def get_dependency_type(dep_type):
-    '''Determine the dependency type'''
-    rval = 0
-    if 'soft' == dep_type:
-        rval = 1
-
-    return rval
-
-def get_service_id_by_name(zapi, dependencies):
-    '''Fetch the service id for an itservice'''
-    deps = []
-    for dep in dependencies:
-        if dep['name'] == 'root':
-            deps.append(dep)
-            continue
-
-        content = zapi.get_content('service',
-                                   'get',
-                                   {'filter': {'name': dep['name']},
-                                    'selectDependencies': 'extend',
-                                   })
-        if content.has_key('result') and content['result']:
-            dep['serviceid'] = content['result'][0]['serviceid']
-            deps.append(dep)
-
-    return deps
-
-def add_dependencies(zapi, service_name, dependencies):
-    '''Fetch the service id for an itservice
-
-       Add a dependency on the parent for this current service item.
-    '''
-
-    results = get_service_id_by_name(zapi, [{'name': service_name}])
-
-    content = {}
-    for dep in dependencies:
-        content = zapi.get_content('service',
-                                   'adddependencies',
-                                   {'serviceid': results[0]['serviceid'],
-                                    'dependsOnServiceid': dep['serviceid'],
-                                    'soft': get_dependency_type(dep['dep_type']),
-                                   })
-        if content.has_key('result') and content['result']:
-            continue
-        else:
-            break
-
-    return content
-
-def get_show_sla(inc_sla):
-    ''' Determine the showsla paramter
-    '''
-    rval = 1
-    if 'do not cacluate' in inc_sla:
-        rval = 0
-    return rval
-
-def get_algorithm(inc_algorithm_str):
-    '''
-    Determine which type algorithm
-    '''
-    rval = 0
-    if 'at least one' in inc_algorithm_str:
-        rval = 1
-    elif 'all' in inc_algorithm_str:
-        rval = 2
-
-    return rval
-
-# The branches are needed for CRUD and error handling
-# pylint: disable=too-many-branches
-def main():
-    '''
-    ansible zabbix module for zbx_itservice
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            algorithm=dict(default='do not calculate', choices=['do not calculate', 'at least one', 'all'], type='str'),
-            show_sla=dict(default='calculate', choices=['do not calculate', 'calculate'], type='str'),
-            good_sla=dict(default='99.9', type='float'),
-            sort_order=dict(default=1, type='int'),
-            state=dict(default='present', type='str'),
-            trigger_id=dict(default=None, type='int'),
-            dependencies=dict(default=[], type='list'),
-            dep_type=dict(default='hard', choices=['hard', 'soft'], type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'service'
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'filter': {'name': module.params['name']},
-                                'selectDependencies': 'extend',
-                               })
-
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0]['serviceid']])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        dependencies = get_service_id_by_name(zapi, module.params['dependencies'])
-        params = {'name': module.params['name'],
-                  'algorithm': get_algorithm(module.params['algorithm']),
-                  'showsla': get_show_sla(module.params['show_sla']),
-                  'goodsla': module.params['good_sla'],
-                  'sortorder': module.params['sort_order'],
-                  'triggerid': module.params['trigger_id']
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            if dependencies:
-                content = add_dependencies(zapi, module.params['name'], dependencies)
-
-                if content.has_key('error'):
-                    module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-
-        ########
-        # UPDATE
-        ########
-        params['dependencies'] = dependencies
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'goodsla':
-                if float(value) != float(zab_results[key]):
-                    differences[key] = value
-
-            elif key == 'dependencies':
-                zab_dep_ids = [item['serviceid'] for item in zab_results[key]]
-                user_dep_ids = [item['serviceid'] for item in dependencies]
-                if set(zab_dep_ids) != set(user_dep_ids):
-                    differences[key] = format_dependencies(dependencies)
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        differences['serviceid'] = zab_results['serviceid']
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_mediatype.py b/roles/lib_zabbix/library/zbx_mediatype.py
deleted file mode 100644
index b8def3ca4..000000000
--- a/roles/lib_zabbix/library/zbx_mediatype.py
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/usr/bin/env python
-'''
- Ansible module for mediatype
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix mediatype ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_mtype(mtype):
-    '''
-    Transport used by the media type.
-    Possible values:
-    0 - email;
-    1 - script;
-    2 - SMS;
-    3 - Jabber;
-    100 - Ez Texting.
-    '''
-    mtype = mtype.lower()
-    media_type = None
-    if mtype == 'script':
-        media_type = 1
-    elif mtype == 'sms':
-        media_type = 2
-    elif mtype == 'jabber':
-        media_type = 3
-    elif mtype == 'script':
-        media_type = 100
-    else:
-        media_type = 0
-
-    return media_type
-
-def main():
-    '''
-    Ansible zabbix module for mediatype
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            description=dict(default=None, type='str'),
-            mtype=dict(default=None, type='str'),
-            smtp_server=dict(default=None, type='str'),
-            smtp_helo=dict(default=None, type='str'),
-            smtp_email=dict(default=None, type='str'),
-            passwd=dict(default=None, type='str'),
-            path=dict(default=None, type='str'),
-            username=dict(default=None, type='str'),
-            status=dict(default='enabled', type='str'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'mediatype'
-    idname = "mediatypeid"
-    description = module.params['description']
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name, 'get', {'search': {'description': description}})
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    if state == 'present':
-        status = 1
-        if module.params['status']:
-            status = 0
-        params = {'description': description,
-                  'type': get_mtype(module.params['mtype']),
-                  'smtp_server': module.params['smtp_server'],
-                  'smtp_helo': module.params['smtp_helo'],
-                  'smtp_email': module.params['smtp_email'],
-                  'passwd': module.params['passwd'],
-                  'exec_path': module.params['path'],
-                  'username': module.params['username'],
-                  'status': status,
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-        # already exists, we need to update it
-        # let's compare properties
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-            if zab_results[key] != value and \
-               zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_template.py b/roles/lib_zabbix/library/zbx_template.py
deleted file mode 100644
index cc713b998..000000000
--- a/roles/lib_zabbix/library/zbx_template.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env python
-'''
-Ansible module for template
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix template ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def main():
-    ''' Ansible module for template
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'template'
-    idname = 'templateid'
-    tname = module.params['name']
-    state = module.params['state']
-    # get a template, see if it exists
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'host': tname},
-                                'selectParentTemplates': 'templateid',
-                                'selectGroups': 'groupid',
-                                'selectApplications': 'applicationid',
-                                'selectDiscoveries': 'extend',
-                               })
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        if not tname:
-            module.exit_json(failed=True,
-                             changed=False,
-                             results='Must specifiy a template name.',
-                             state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    if state == 'present':
-        params = {'groups': module.params.get('groups', [{'groupid': '1'}]),
-                  'host': tname,
-                 }
-
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-            module.exit_json(changed=True, results=content['result'], state='present')
-        # already exists, we need to update it
-        # let's compare properties
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-            if key == 'templates' and zab_results.has_key('parentTemplates'):
-                if zab_results['parentTemplates'] != value:
-                    differences[key] = value
-            elif zab_results[key] != str(value) and zab_results[key] != value:
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=content['result'], state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_trigger.py b/roles/lib_zabbix/library/zbx_trigger.py
deleted file mode 100644
index 323defbd9..000000000
--- a/roles/lib_zabbix/library/zbx_trigger.py
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/usr/bin/env python
-'''
-ansible module for zabbix triggers
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix trigger ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_priority(priority):
-    ''' determine priority
-    '''
-    prior = 0
-    if 'info' in priority:
-        prior = 1
-    elif 'warn' in priority:
-        prior = 2
-    elif 'avg' == priority or 'ave' in priority:
-        prior = 3
-    elif 'high' in priority:
-        prior = 4
-    elif 'dis' in priority:
-        prior = 5
-
-    return prior
-
-def get_deps(zapi, deps):
-    ''' get trigger dependencies
-    '''
-    results = []
-    for desc in deps:
-        content = zapi.get_content('trigger',
-                                   'get',
-                                   {'filter': {'description': desc},
-                                    'expandExpression': True,
-                                    'selectDependencies': 'triggerid',
-                                   })
-        if content.has_key('result'):
-            results.append({'triggerid': content['result'][0]['triggerid']})
-
-    return results
-
-
-def get_trigger_status(inc_status):
-    ''' Determine the trigger's status
-        0 is enabled
-        1 is disabled
-    '''
-    r_status = 0
-    if inc_status == 'disabled':
-        r_status = 1
-
-    return r_status
-
-def get_template_id(zapi, template_name):
-    '''
-    get related templates
-    '''
-    template_ids = []
-    app_ids = {}
-    # Fetch templates by name
-    content = zapi.get_content('template',
-                               'get',
-                               {'search': {'host': template_name},
-                                'selectApplications': ['applicationid', 'name']})
-    if content.has_key('result'):
-        template_ids.append(content['result'][0]['templateid'])
-        for app in content['result'][0]['applications']:
-            app_ids[app['name']] = app['applicationid']
-
-    return template_ids, app_ids
-
-def main():
-    '''
-    Create a trigger in zabbix
-
-    Example:
-    "params": {
-        "description": "Processor load is too high on {HOST.NAME}",
-        "expression": "{Linux server:system.cpu.load[percpu,avg1].last()}>5",
-        "dependencies": [
-            {
-                "triggerid": "14062"
-            }
-        ]
-    },
-
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            expression=dict(default=None, type='str'),
-            name=dict(default=None, type='str'),
-            description=dict(default=None, type='str'),
-            dependencies=dict(default=[], type='list'),
-            priority=dict(default='avg', type='str'),
-            url=dict(default=None, type='str'),
-            status=dict(default=None, type='str'),
-            state=dict(default='present', type='str'),
-            template_name=dict(default=None, type='str'),
-            hostgroup_name=dict(default=None, type='str'),
-            query_type=dict(default='filter', choices=['filter', 'search'], type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'trigger'
-    idname = "triggerid"
-    state = module.params['state']
-    tname = module.params['name']
-
-    templateid = None
-    if module.params['template_name']:
-        templateid, _ = get_template_id(zapi, module.params['template_name'])
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {module.params['query_type']: {'description': tname},
-                                'expandExpression': True,
-                                'selectDependencies': 'triggerid',
-                                'templateids': templateid,
-                                'group': module.params['hostgroup_name'],
-                               })
-
-    # Get
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    # Delete
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-        params = {'description': tname,
-                  'comments':  module.params['description'],
-                  'expression':  module.params['expression'],
-                  'dependencies': get_deps(zapi, module.params['dependencies']),
-                  'priority': get_priority(module.params['priority']),
-                  'url': module.params['url'],
-                  'status': get_trigger_status(module.params['status']),
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-        ########
-        # UPDATE
-        ########
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_triggerprototype.py b/roles/lib_zabbix/library/zbx_triggerprototype.py
deleted file mode 100644
index 34a7396a7..000000000
--- a/roles/lib_zabbix/library/zbx_triggerprototype.py
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/env python
-'''
-ansible module for zabbix triggerprototypes
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix triggerprototypes ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_priority(priority):
-    ''' determine priority
-    '''
-    prior = 0
-    if 'info' in priority:
-        prior = 1
-    elif 'warn' in priority:
-        prior = 2
-    elif 'avg' == priority or 'ave' in priority:
-        prior = 3
-    elif 'high' in priority:
-        prior = 4
-    elif 'dis' in priority:
-        prior = 5
-
-    return prior
-
-def get_trigger_status(inc_status):
-    ''' Determine the trigger's status
-        0 is enabled
-        1 is disabled
-    '''
-    r_status = 0
-    if inc_status == 'disabled':
-        r_status = 1
-
-    return r_status
-
-
-def main():
-    '''
-    Create a triggerprototype in zabbix
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            name=dict(default=None, type='str'),
-            expression=dict(default=None, type='str'),
-            description=dict(default=None, type='str'),
-            priority=dict(default='avg', type='str'),
-            url=dict(default=None, type='str'),
-            status=dict(default=None, type='str'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'triggerprototype'
-    idname = "triggerid"
-    state = module.params['state']
-    tname = module.params['name']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'filter': {'description': tname},
-                                'expandExpression': True,
-                                'selectDependencies': 'triggerid',
-                               })
-
-    # Get
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    # Delete
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-        params = {'description': tname,
-                  'comments':  module.params['description'],
-                  'expression':  module.params['expression'],
-                  'priority': get_priority(module.params['priority']),
-                  'url': module.params['url'],
-                  'status': get_trigger_status(module.params['status']),
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-        ########
-        # UPDATE
-        ########
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_user.py b/roles/lib_zabbix/library/zbx_user.py
deleted file mode 100644
index 68c5cfbfe..000000000
--- a/roles/lib_zabbix/library/zbx_user.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env python
-'''
-ansible module for zabbix users
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix user ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_usergroups(zapi, usergroups):
-    ''' Get usergroups
-    '''
-    ugroups = []
-    for ugr in usergroups:
-        content = zapi.get_content('usergroup',
-                                   'get',
-                                   {'search': {'name': ugr},
-                                    #'selectUsers': 'userid',
-                                    #'getRights': 'extend'
-                                   })
-        if content['result']:
-            ugroups.append({'usrgrpid': content['result'][0]['usrgrpid']})
-
-    return ugroups or None
-
-def get_passwd(passwd):
-    '''Determine if password is set, if not, return 'zabbix'
-    '''
-    if passwd:
-        return passwd
-
-    return 'zabbix'
-
-def get_usertype(user_type):
-    '''
-    Determine zabbix user account type
-    '''
-    if not user_type:
-        return None
-
-    utype = 1
-    if 'super' in user_type:
-        utype = 3
-    elif 'admin' in user_type or user_type == 'admin':
-        utype = 2
-
-    return utype
-
-def main():
-    '''
-    ansible zabbix module for users
-    '''
-
-    ##def user(self, name, state='present', params=None):
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            login=dict(default=None, type='str'),
-            first_name=dict(default=None, type='str'),
-            last_name=dict(default=None, type='str'),
-            user_type=dict(default=None, type='str'),
-            password=dict(default=None, type='str'),
-            refresh=dict(default=None, type='int'),
-            update_password=dict(default=False, type='bool'),
-            user_groups=dict(default=[], type='list'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    ## before we can create a user media and users with media types we need media
-    zbx_class_name = 'user'
-    idname = "userid"
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'output': 'extend',
-                                'search': {'alias': module.params['login']},
-                                "selectUsrgrps": 'usergrpid',
-                               })
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    if state == 'absent':
-        if not exists(content) or len(content['result']) == 0:
-            module.exit_json(changed=False, state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    if state == 'present':
-
-        params = {'alias': module.params['login'],
-                  'passwd': get_passwd(module.params['password']),
-                  'usrgrps': get_usergroups(zapi, module.params['user_groups']),
-                  'name': module.params['first_name'],
-                  'surname': module.params['last_name'],
-                  'refresh': module.params['refresh'],
-                  'type': get_usertype(module.params['user_type']),
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] is None]
-
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('Error'):
-                module.exit_json(failed=True, changed=False, results=content, state='present')
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-        # already exists, we need to update it
-        # let's compare properties
-        differences = {}
-
-        # Update password
-        if not module.params['update_password']:
-            params.pop('passwd', None)
-
-        zab_results = content['result'][0]
-        for key, value in params.items():
-
-            if key == 'usrgrps':
-                # this must be done as a list of ordered dictionaries fails comparison
-                if not all([_ in value for _ in zab_results[key]]):
-                    differences[key] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_user_media.py b/roles/lib_zabbix/library/zbx_user_media.py
deleted file mode 100644
index fc5624346..000000000
--- a/roles/lib_zabbix/library/zbx_user_media.py
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/usr/bin/env python
-'''
- Ansible module for user media
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix user media  ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_mtype(zapi, mtype):
-    '''Get mediatype
-
-       If passed an int, return it as the mediatypeid
-       if its a string, then try to fetch through a description
-    '''
-    if isinstance(mtype, int):
-        return mtype
-    try:
-        return int(mtype)
-    except ValueError:
-        pass
-
-    content = zapi.get_content('mediatype', 'get', {'filter': {'description': mtype}})
-    if content.has_key('result') and content['result']:
-        return content['result'][0]['mediatypeid']
-
-    return None
-
-def get_user(zapi, user):
-    ''' Get userids from user aliases
-    '''
-    content = zapi.get_content('user', 'get', {'filter': {'alias': user}})
-    if content['result']:
-        return content['result'][0]
-
-    return None
-
-def get_severity(severity):
-    ''' determine severity
-    '''
-    if isinstance(severity, int) or \
-       isinstance(severity, str):
-        return severity
-
-    val = 0
-    sev_map = {
-        'not': 2**0,
-        'inf': 2**1,
-        'war': 2**2,
-        'ave':  2**3,
-        'avg':  2**3,
-        'hig': 2**4,
-        'dis': 2**5,
-    }
-    for level in severity:
-        val |= sev_map[level[:3].lower()]
-    return val
-
-def get_zbx_user_query_data(zapi, user_name):
-    ''' If name exists, retrieve it, and build query params.
-    '''
-    query = {}
-    if user_name:
-        zbx_user = get_user(zapi, user_name)
-        query = {'userid': zbx_user['userid']}
-
-    return query
-
-def find_media(medias, user_media):
-    ''' Find the user media in the list of medias
-    '''
-    for media in medias:
-        if all([media[key] == str(user_media[key]) for key in user_media.keys()]):
-            return media
-    return None
-
-def get_active(is_active):
-    '''Determine active value
-       0 - enabled
-       1 - disabled
-    '''
-    active = 1
-    if is_active:
-        active = 0
-
-    return active
-
-def get_mediatype(zapi, mediatype, mediatype_desc):
-    ''' Determine mediatypeid
-    '''
-    mtypeid = None
-    if mediatype:
-        mtypeid = get_mtype(zapi, mediatype)
-    elif mediatype_desc:
-        mtypeid = get_mtype(zapi, mediatype_desc)
-
-    return mtypeid
-
-def preprocess_medias(zapi, medias):
-    ''' Insert the correct information when processing medias '''
-    for media in medias:
-        # Fetch the mediatypeid from the media desc (name)
-        if media.has_key('mediatype'):
-            media['mediatypeid'] = get_mediatype(zapi, mediatype=None, mediatype_desc=media.pop('mediatype'))
-
-        media['active'] = get_active(media.get('active'))
-        media['severity'] = int(get_severity(media['severity']))
-
-    return medias
-
-# Disabling branching as the logic requires branches.
-# I've also added a few safeguards which required more branches.
-# pylint: disable=too-many-branches
-def main():
-    '''
-    Ansible zabbix module for mediatype
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            login=dict(default=None, type='str'),
-            active=dict(default=False, type='bool'),
-            medias=dict(default=None, type='list'),
-            mediaid=dict(default=None, type='int'),
-            mediatype=dict(default=None, type='str'),
-            mediatype_desc=dict(default=None, type='str'),
-            #d-d,hh:mm-hh:mm;d-d,hh:mm-hh:mm...
-            period=dict(default=None, type='str'),
-            sendto=dict(default=None, type='str'),
-            severity=dict(default=None, type='str'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    #Set the instance and the template for the rest of the calls
-    zbx_class_name = 'user'
-    idname = "mediaid"
-    state = module.params['state']
-
-    # User media is fetched through the usermedia.get
-    zbx_user_query = get_zbx_user_query_data(zapi, module.params['login'])
-    content = zapi.get_content('usermedia', 'get',
-                               {'userids': [uid for user, uid in zbx_user_query.items()]})
-    #####
-    # Get
-    #####
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    ########
-    # Delete
-    ########
-    if state == 'absent':
-        if not exists(content) or len(content['result']) == 0:
-            module.exit_json(changed=False, state="absent")
-
-        if not module.params['login']:
-            module.exit_json(failed=True, changed=False, results='Must specifiy a user login.', state="absent")
-
-        content = zapi.get_content(zbx_class_name, 'deletemedia', [res[idname] for res in content['result']])
-
-        if content.has_key('error'):
-            module.exit_json(changed=False, results=content['error'], state="absent")
-
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-        active = get_active(module.params['active'])
-        mtypeid = get_mediatype(zapi, module.params['mediatype'], module.params['mediatype_desc'])
-
-        medias = module.params['medias']
-        if medias == None:
-            medias = [{'mediatypeid': mtypeid,
-                       'sendto': module.params['sendto'],
-                       'active': active,
-                       'severity': int(get_severity(module.params['severity'])),
-                       'period': module.params['period'],
-                      }]
-        else:
-            medias = preprocess_medias(zapi, medias)
-
-        params = {'users': [zbx_user_query],
-                  'medias': medias,
-                  'output': 'extend',
-                 }
-
-        ########
-        # Create
-        ########
-        if not exists(content):
-            if not params['medias']:
-                module.exit_json(changed=False, results=content['result'], state='present')
-
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'addmedia', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-        # mediaid signifies an update
-        # If user params exists, check to see if they already exist in zabbix
-        # if they exist, then return as no update
-        # elif they do not exist, then take user params only
-        ########
-        # Update
-        ########
-        diff = {'medias': [], 'users': {}}
-        _ = [diff['medias'].append(media) for media in params['medias'] if not find_media(content['result'], media)]
-
-        if not diff['medias']:
-            module.exit_json(changed=False, results=content['result'], state="present")
-
-        for user in params['users']:
-            diff['users']['userid'] = user['userid']
-
-        # Medias have no real unique key so therefore we need to make it like the incoming user's request
-        diff['medias'] = medias
-
-        # We have differences and need to update
-        content = zapi.get_content(zbx_class_name, 'updatemedia', diff)
-
-        if content.has_key('error'):
-            module.exit_json(failed=True, changed=False, results=content['error'], state="present")
-
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/library/zbx_usergroup.py b/roles/lib_zabbix/library/zbx_usergroup.py
deleted file mode 100644
index e30ce6678..000000000
--- a/roles/lib_zabbix/library/zbx_usergroup.py
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/usr/bin/env python
-'''
-zabbix ansible module for usergroups
-'''
-# vim: expandtab:tabstop=4:shiftwidth=4
-#
-#   Zabbix usergroup ansible module
-#
-#
-#   Copyright 2015 Red Hat Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-
-# This is in place because each module looks similar to each other.
-# These need duplicate code as their behavior is very similar
-# but different for each zabbix class.
-# pylint: disable=duplicate-code
-
-# Disabling too-many-branches as we need the error checking and the if-statements
-# to determine the proper state
-# pylint: disable=too-many-branches
-
-# pylint: disable=import-error
-from openshift_tools.zbxapi import ZabbixAPI, ZabbixConnection
-
-def exists(content, key='result'):
-    ''' Check if key exists in content or the size of content[key] > 0
-    '''
-    if not content.has_key(key):
-        return False
-
-    if not content[key]:
-        return False
-
-    return True
-
-def get_rights(zapi, rights):
-    '''Get rights
-    '''
-    if rights == None:
-        return None
-
-    perms = []
-    for right in rights:
-        hstgrp = right.keys()[0]
-        perm = right.values()[0]
-        content = zapi.get_content('hostgroup', 'get', {'search': {'name': hstgrp}})
-        if content['result']:
-            permission = 0
-            if perm == 'ro':
-                permission = 2
-            elif perm == 'rw':
-                permission = 3
-            perms.append({'id': content['result'][0]['groupid'],
-                          'permission': permission})
-    return perms
-
-def get_gui_access(access):
-    ''' Return the gui_access for a usergroup
-    '''
-    access = access.lower()
-    if access == 'internal':
-        return 1
-    elif access == 'disabled':
-        return 2
-
-    return 0
-
-def get_debug_mode(mode):
-    ''' Return the debug_mode for a usergroup
-    '''
-    mode = mode.lower()
-    if mode == 'enabled':
-        return 1
-
-    return 0
-
-def get_user_status(status):
-    ''' Return the user_status for a usergroup
-    '''
-    status = status.lower()
-    if status == 'enabled':
-        return 0
-
-    return 1
-
-
-def get_userids(zapi, users):
-    ''' Get userids from user aliases
-    '''
-    if not users:
-        return None
-
-    userids = []
-    for alias in users:
-        content = zapi.get_content('user', 'get', {'search': {'alias': alias}})
-        if content['result']:
-            userids.append(content['result'][0]['userid'])
-
-    return userids
-
-def main():
-    ''' Ansible module for usergroup
-    '''
-
-    module = AnsibleModule(
-        argument_spec=dict(
-            zbx_server=dict(default='https://localhost/zabbix/api_jsonrpc.php', type='str'),
-            zbx_user=dict(default=os.environ.get('ZABBIX_USER', None), type='str'),
-            zbx_password=dict(default=os.environ.get('ZABBIX_PASSWORD', None), type='str'),
-            zbx_debug=dict(default=False, type='bool'),
-            debug_mode=dict(default='disabled', type='str'),
-            gui_access=dict(default='default', type='str'),
-            status=dict(default='enabled', type='str'),
-            name=dict(default=None, type='str', required=True),
-            rights=dict(default=None, type='list'),
-            users=dict(default=None, type='list'),
-            state=dict(default='present', type='str'),
-        ),
-        #supports_check_mode=True
-    )
-
-    zapi = ZabbixAPI(ZabbixConnection(module.params['zbx_server'],
-                                      module.params['zbx_user'],
-                                      module.params['zbx_password'],
-                                      module.params['zbx_debug']))
-
-    zbx_class_name = 'usergroup'
-    idname = "usrgrpid"
-    uname = module.params['name']
-    state = module.params['state']
-
-    content = zapi.get_content(zbx_class_name,
-                               'get',
-                               {'search': {'name': uname},
-                                'selectUsers': 'userid',
-                               })
-    #******#
-    # GET
-    #******#
-    if state == 'list':
-        module.exit_json(changed=False, results=content['result'], state="list")
-
-    #******#
-    # DELETE
-    #******#
-    if state == 'absent':
-        if not exists(content):
-            module.exit_json(changed=False, state="absent")
-
-        if not uname:
-            module.exit_json(failed=True, changed=False, results='Need to pass in a user.', state="error")
-
-        content = zapi.get_content(zbx_class_name, 'delete', [content['result'][0][idname]])
-        module.exit_json(changed=True, results=content['result'], state="absent")
-
-    # Create and Update
-    if state == 'present':
-
-        params = {'name': uname,
-                  'rights': get_rights(zapi, module.params['rights']),
-                  'users_status': get_user_status(module.params['status']),
-                  'gui_access': get_gui_access(module.params['gui_access']),
-                  'debug_mode': get_debug_mode(module.params['debug_mode']),
-                  'userids': get_userids(zapi, module.params['users']),
-                 }
-
-        # Remove any None valued params
-        _ = [params.pop(key, None) for key in params.keys() if params[key] == None]
-
-        #******#
-        # CREATE
-        #******#
-        if not exists(content):
-            # if we didn't find it, create it
-            content = zapi.get_content(zbx_class_name, 'create', params)
-
-            if content.has_key('error'):
-                module.exit_json(failed=True, changed=True, results=content['error'], state="present")
-
-            module.exit_json(changed=True, results=content['result'], state='present')
-
-
-        ########
-        # UPDATE
-        ########
-        differences = {}
-        zab_results = content['result'][0]
-        for key, value in params.items():
-            if key == 'rights':
-                differences['rights'] = value
-
-            elif key == 'userids' and zab_results.has_key('users'):
-                if zab_results['users'] != value:
-                    differences['userids'] = value
-
-            elif zab_results[key] != value and zab_results[key] != str(value):
-                differences[key] = value
-
-        if not differences:
-            module.exit_json(changed=False, results=zab_results, state="present")
-
-        # We have differences and need to update
-        differences[idname] = zab_results[idname]
-        content = zapi.get_content(zbx_class_name, 'update', differences)
-        module.exit_json(changed=True, results=content['result'], state="present")
-
-    module.exit_json(failed=True,
-                     changed=False,
-                     results='Unknown state passed. %s' % state,
-                     state="unknown")
-
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, locally-disabled
-# import module snippets.  This are required
-from ansible.module_utils.basic import *
-
-main()
diff --git a/roles/lib_zabbix/tasks/create_template.yml b/roles/lib_zabbix/tasks/create_template.yml
deleted file mode 100644
index 783249c3a..000000000
--- a/roles/lib_zabbix/tasks/create_template.yml
+++ /dev/null
@@ -1,146 +0,0 @@
----
-- name: Template Create Template
-  zbx_template:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ template.name }}"
-  register: created_template
-
-
-- set_fact:
-    lzbx_item_applications: "{{ template.zitems | default([], True) | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
-    lzbx_itemprototype_applications: "{{ template.zitemprototypes | default([], True) | oo_select_keys_from_list(['applications']) | oo_flatten | unique }}"
-
-- name: Create Application
-  zbx_application:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ item }}"
-    template_name: "{{ template.name }}"
-  with_items:
-  - "{{ lzbx_item_applications }}"
-  - "{{ lzbx_itemprototype_applications }}"
-  register: created_application
-  when: template.zitems is defined or template.zitemprototypes is defined
-
-- name: Create Items
-  zbx_item:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    key: "{{ item.key }}"
-    name: "{{ item.name | default(item.key, true) }}"
-    value_type: "{{ item.value_type | default('int') }}"
-    data_type: "{{ item.data_type | default('decimal') }}"
-    description: "{{ item.description | default('', True) }}"
-    multiplier: "{{ item.multiplier | default('', True) }}"
-    units: "{{ item.units | default('', True) }}"
-    template_name: "{{ template.name }}"
-    applications: "{{ item.applications }}"
-    zabbix_type: "{{ item.zabbix_type | default('trapper') }}"
-    interval: "{{ item.interval | default(60, True) }}"
-    delta: "{{ item.delta | default(0, True) }}"
-  with_items: template.zitems
-  register: created_items
-  when: template.zitems is defined
-
-- name: Create Triggers
-  zbx_trigger:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ item.name }}"
-    description: "{{ item.description | default('', True) }}"
-    dependencies: "{{ item.dependencies | default([], True) }}"
-    expression: "{{ item.expression }}"
-    priority: "{{ item.priority }}"
-    url: "{{ item.url | default(None, True) }}"
-    status: "{{ item.status | default('', True) }}"
-  with_items: template.ztriggers
-  when: template.ztriggers is defined
-
-- name: Create Actions
-  zbx_action:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    state: "{{ item.state | default('present', True) }}"
-    name: "{{ item.name }}"
-    status: "{{ item.status | default('enabled', True) }}"
-    escalation_time: "{{ item.escalation_time }}"
-    conditions_filter: "{{ item.conditions_filter }}"
-    operations: "{{ item.operations }}"
-  with_items: template.zactions
-  when: template.zactions is defined
-
-- name: Create Discoveryrules
-  zbx_discoveryrule:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ item.name }}"
-    key: "{{ item.key }}"
-    lifetime: "{{ item.lifetime }}"
-    template_name: "{{ template.name }}"
-    description: "{{ item.description | default('', True) }}"
-  with_items: template.zdiscoveryrules
-  when: template.zdiscoveryrules is defined
-
-- name: Create Item Prototypes
-  zbx_itemprototype:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ item.name }}"
-    key: "{{ item.key }}"
-    discoveryrule_key: "{{ item.discoveryrule_key }}"
-    value_type: "{{ item.value_type }}"
-    data_type: "{{ item.data_type | default('decimal') }}"
-    template_name: "{{ template.name }}"
-    applications: "{{ item.applications }}"
-    description: "{{ item.description | default('', True) }}"
-    multiplier: "{{ item.multiplier | default('', True) }}"
-    units: "{{ item.units | default('', True) }}"
-    interval: "{{ item.interval | default(60, True) }}"
-    delta: "{{ item.delta | default(0, True) }}"
-  with_items: template.zitemprototypes
-  when: template.zitemprototypes is defined
-
-- name: Create Trigger Prototypes
-  zbx_triggerprototype:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ item.name }}"
-    expression: "{{ item.expression }}"
-    url: "{{ item.url | default('', True) }}"
-    priority: "{{ item.priority | default('average', True) }}"
-    description: "{{ item.description | default('', True) }}"
-  with_items: template.ztriggerprototypes
-  when: template.ztriggerprototypes is defined
-
-- name: Create Graphs
-  zbx_graph:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ item.name }}"
-    height: "{{ item.height }}"
-    width: "{{ item.width }}"
-    graph_items: "{{ item.graph_items }}"
-  with_items: template.zgraphs
-  when: template.zgraphs is defined
-
-- name: Create Graph Prototypes
-  zbx_graphprototype:
-    zbx_server: "{{ server }}"
-    zbx_user: "{{ user }}"
-    zbx_password: "{{ password }}"
-    name: "{{ item.name }}"
-    height: "{{ item.height }}"
-    width: "{{ item.width }}"
-    graph_items: "{{ item.graph_items }}"
-  with_items: template.zgraphprototypes
-  when: template.zgraphprototypes is defined
diff --git a/roles/lib_zabbix/tasks/create_user.yml b/roles/lib_zabbix/tasks/create_user.yml
deleted file mode 100644
index 1f752a9e1..000000000
--- a/roles/lib_zabbix/tasks/create_user.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Update zabbix credentialss for a user
-  zbx_user:
-    server: "{{ ozb_server }}"
-    user: "{{ ozb_user }}"
-    password: "{{ ozb_password }}"
-    alias: "{{ ozb_username }}"
-    passwd: "{{ ozb_new_password | default(ozb_password, true) }}"
-  register: user
-
-- debug: var=user.results