11 files changed, 25 insertions, 115 deletions
diff --git a/roles/lib_openshift/library/oadm_manage_node.py b/roles/lib_openshift/library/oc_adm_manage_node.py
index 8bb0538c0..4763331f8 100644
--- a/roles/lib_openshift/library/oadm_manage_node.py
+++ b/roles/lib_openshift/library/oc_adm_manage_node.py
@@ -54,7 +54,7 @@ from ansible.module_utils.basic import AnsibleModule
 
 DOCUMENTATION = '''
 ---
-module: oadm_manage_node
+module: oc_adm_manage_node
 short_description: Module to manage openshift nodes
 description:
   - Manage openshift nodes programmatically.
@@ -126,13 +126,13 @@ extends_documentation_fragment: []
 
 EXAMPLES = '''
 - name: oadm manage-node --schedulable=true --selector=ops_node=new
-  oadm_manage_node:
+  oc_adm_manage_node:
     selector: ops_node=new
     schedulable: True
   register: schedout
 
 - name: oadm manage-node my-k8s-node-5 --evacuate
-  oadm_manage_node:
+  oc_adm_manage_node:
     node:  my-k8s-node-5
     evacuate: True
     force: True
@@ -1369,7 +1369,7 @@ class OpenShiftCLIConfig(object):
 
 # -*- -*- -*- End included fragment: lib/base.py -*- -*- -*-
 
-# -*- -*- -*- Begin included fragment: class/oadm_manage_node.py -*- -*- -*-
+# -*- -*- -*- Begin included fragment: class/oc_adm_manage_node.py -*- -*- -*-
 
 
 class ManageNodeException(Exception):
@@ -1578,9 +1578,9 @@ class ManageNode(OpenShiftCLI):
 
         return {'changed': changed, 'results': results, 'state': "present"}
 
-# -*- -*- -*- End included fragment: class/oadm_manage_node.py -*- -*- -*-
+# -*- -*- -*- End included fragment: class/oc_adm_manage_node.py -*- -*- -*-
 
-# -*- -*- -*- Begin included fragment: ansible/oadm_manage_node.py -*- -*- -*-
+# -*- -*- -*- Begin included fragment: ansible/oc_adm_manage_node.py -*- -*- -*-
 
 
 def main():
@@ -1618,4 +1618,4 @@ def main():
 if __name__ == "__main__":
     main()
 
-# -*- -*- -*- End included fragment: ansible/oadm_manage_node.py -*- -*- -*-
+# -*- -*- -*- End included fragment: ansible/oc_adm_manage_node.py -*- -*- -*-
diff --git a/roles/lib_openshift/src/ansible/oadm_manage_node.py b/roles/lib_openshift/src/ansible/oc_adm_manage_node.py
index b870c1211..b870c1211 100644
--- a/roles/lib_openshift/src/ansible/oadm_manage_node.py
+++ b/roles/lib_openshift/src/ansible/oc_adm_manage_node.py
diff --git a/roles/lib_openshift/src/class/oadm_manage_node.py b/roles/lib_openshift/src/class/oc_adm_manage_node.py
index c07320477..c07320477 100644
--- a/roles/lib_openshift/src/class/oadm_manage_node.py
+++ b/roles/lib_openshift/src/class/oc_adm_manage_node.py
diff --git a/roles/lib_openshift/src/doc/manage_node b/roles/lib_openshift/src/doc/manage_node
index 382377f3e..b651ea4e7 100644
--- a/roles/lib_openshift/src/doc/manage_node
+++ b/roles/lib_openshift/src/doc/manage_node
@@ -3,7 +3,7 @@
 
 DOCUMENTATION = '''
 ---
-module: oadm_manage_node
+module: oc_adm_manage_node
 short_description: Module to manage openshift nodes
 description:
   - Manage openshift nodes programmatically.
@@ -75,13 +75,13 @@ extends_documentation_fragment: []
 
 EXAMPLES = '''
 - name: oadm manage-node --schedulable=true --selector=ops_node=new
-  oadm_manage_node:
+  oc_adm_manage_node:
     selector: ops_node=new
     schedulable: True
   register: schedout
 
 - name: oadm manage-node my-k8s-node-5 --evacuate
-  oadm_manage_node:
+  oc_adm_manage_node:
     node:  my-k8s-node-5
     evacuate: True
     force: True
diff --git a/roles/lib_openshift/src/sources.yml b/roles/lib_openshift/src/sources.yml
index f16b3c8de..44a1524b0 100644
--- a/roles/lib_openshift/src/sources.yml
+++ b/roles/lib_openshift/src/sources.yml
@@ -9,15 +9,15 @@ oc_adm_ca_server_cert.py:
 - class/oc_adm_ca_server_cert.py
 - ansible/oc_adm_ca_server_cert.py
 
-oadm_manage_node.py:
+oc_adm_manage_node.py:
 - doc/generated
 - doc/license
 - lib/import.py
 - doc/manage_node
 - ../../lib_utils/src/class/yedit.py
 - lib/base.py
-- class/oadm_manage_node.py
-- ansible/oadm_manage_node.py
+- class/oc_adm_manage_node.py
+- ansible/oc_adm_manage_node.py
 
 oc_adm_policy_user.py:
 - doc/generated
diff --git a/roles/lib_openshift/src/test/integration/oadm_manage_node.yml b/roles/lib_openshift/src/test/integration/oc_adm_manage_node.yml
index 3ee13a409..1ed2ef11b 100755
--- a/roles/lib_openshift/src/test/integration/oadm_manage_node.yml
+++ b/roles/lib_openshift/src/test/integration/oc_adm_manage_node.yml
@@ -1,6 +1,6 @@
 #!/usr/bin/ansible-playbook --module-path=../../../library/
 #
-# ./oadm_manage_node.yml -e "cli_master_test=$OPENSHIFT_MASTER
+# ./oc_adm_manage_node.yml -e "cli_master_test=$OPENSHIFT_MASTER
 ---
 - hosts: "{{ cli_master_test }}"
   gather_facts: no
@@ -17,7 +17,7 @@
       node_to_test: "{{ obj_out['results']['results'][0]['items'][0]['metadata']['name'] }}"
 
   - name: list pods from a node
-    oadm_manage_node:
+    oc_adm_manage_node:
       list_pods: True
       node:
       - "{{ node_to_test }}"
@@ -29,7 +29,7 @@
       msg: Pod data was not returned
 
   - name: set node to unschedulable
-    oadm_manage_node:
+    oc_adm_manage_node:
       schedulable: False
       node:
       - "{{ node_to_test }}"
@@ -56,7 +56,7 @@
       that: nodeout.results.results[0]['spec']['unschedulable']
 
   - name: set node to schedulable
-    oadm_manage_node:
+    oc_adm_manage_node:
       schedulable: True
       node:
       - "{{ node_to_test }}"
diff --git a/roles/lib_openshift/src/test/unit/test_oadm_manage_node.py b/roles/lib_openshift/src/test/unit/test_oc_adm_manage_node.py
index 27d98b869..312b1ecbb 100755
--- a/roles/lib_openshift/src/test/unit/test_oadm_manage_node.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_adm_manage_node.py
@@ -1,5 +1,5 @@
 '''
- Unit tests for oadm_manage_node
+ Unit tests for oc_adm_manage_node
 '''
 
 import os
@@ -16,16 +16,16 @@ import mock
 # place class in our python path
 module_path = os.path.join('/'.join(os.path.realpath(__file__).split('/')[:-4]), 'library')  # noqa: E501
 sys.path.insert(0, module_path)
-from oadm_manage_node import ManageNode, locate_oc_binary  # noqa: E402
+from oc_adm_manage_node import ManageNode, locate_oc_binary  # noqa: E402
 
 
 class ManageNodeTest(unittest.TestCase):
     '''
-     Test class for oadm_manage_node
+     Test class for oc_adm_manage_node
     '''
 
-    @mock.patch('oadm_manage_node.Utils.create_tmpfile_copy')
-    @mock.patch('oadm_manage_node.ManageNode.openshift_cmd')
+    @mock.patch('oc_adm_manage_node.Utils.create_tmpfile_copy')
+    @mock.patch('oc_adm_manage_node.ManageNode.openshift_cmd')
     def test_list_pods(self, mock_openshift_cmd, mock_tmpfile_copy):
         ''' Testing a get '''
         params = {'node': ['ip-172-31-49-140.ec2.internal'],
@@ -107,8 +107,8 @@ class ManageNodeTest(unittest.TestCase):
         # returned 2 pods
         self.assertTrue(len(results['results']['nodes']['ip-172-31-49-140.ec2.internal']) == 2)
 
-    @mock.patch('oadm_manage_node.Utils.create_tmpfile_copy')
-    @mock.patch('oadm_manage_node.ManageNode.openshift_cmd')
+    @mock.patch('oc_adm_manage_node.Utils.create_tmpfile_copy')
+    @mock.patch('oc_adm_manage_node.ManageNode.openshift_cmd')
     def test_schedulable_false(self, mock_openshift_cmd, mock_tmpfile_copy):
         ''' Testing a get '''
         params = {'node': ['ip-172-31-49-140.ec2.internal'],
diff --git a/roles/openshift_excluder/tasks/disable.yml b/roles/openshift_excluder/tasks/disable.yml
index a8deb3eb1..2245c7b21 100644
--- a/roles/openshift_excluder/tasks/disable.yml
+++ b/roles/openshift_excluder/tasks/disable.yml
@@ -18,9 +18,5 @@
   # it the docker excluder is enabled, we install it and in case its status is non-zero
   # it is enabled no matter what
 
-# Check the current state of all excluders
-- include: status.yml
-  when: with_status_check | default(docker_excluder_on or openshift_excluder_on) | bool
-
   # And finally adjust an excluder in order to update host components correctly
 - include: adjust.yml
diff --git a/roles/openshift_excluder/tasks/main.yml b/roles/openshift_excluder/tasks/main.yml
deleted file mode 100644
index 78a3d37cb..000000000
--- a/roles/openshift_excluder/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-include: status.yml
diff --git a/roles/openshift_excluder/tasks/status.yml b/roles/openshift_excluder/tasks/status.yml
deleted file mode 100644
index 363ccdbea..000000000
--- a/roles/openshift_excluder/tasks/status.yml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-- name: Determine if excluder packages are installed
-  rpm_q:
-    name: "{{ openshift.common.service_type }}-excluder"
-    state: present
-  register: openshift_excluder_installed
-  failed_when: false
-
-# docker excluder needs to be enable by default
-- name: Determine if docker packages are installed
-  rpm_q:
-    name: "{{ openshift.common.service_type }}-docker-excluder"
-    state: present
-  register: docker_excluder_installed
-  failed_when: false
-
-# The excluder status function returns 0 when everything is excluded
-# and 1 if any packages are missing from the exclusions list and outputs a warning to stderr
-# # atomic-openshift-excluder status ; echo $?
-# exclude -- All packages excluded
-# 0
-# # atomic-openshift-excluder unexclude
-# # atomic-openshift-excluder status ; echo $?
-# unexclude -- At least one package not excluded
-# 1
-
-- block:
-  - include: init.yml
-  - block:
-    - name: Record openshift excluder status
-      command: "{{ openshift.common.service_type }}-excluder status"
-      register: excluder_status
-      failed_when: false
-
-    # Even though the openshift excluder is enabled
-    # if the status is non-zero, disabled the excluder
-    - name: Override openshift excluder enablement if the status is non-zero
-      set_fact:
-        disable_openshift_excluder_override: true
-      when:
-      - "{{ excluder_status.rc | default(0) != 0 }}"
-
-    - debug:
-        msg: "Disabling openshift excluder"
-      when:
-      - "{{ excluder_status.rc | default(0) != 0 }}"
-
-    when:
-    - "{{ openshift_excluder_installed.installed_versions | default([]) | length > 0 }}"
-    - "{{ openshift_excluder_on }}"
-
-  - block:
-    - name: Record docker excluder status
-      command: "{{ openshift.common.service_type }}-docker-excluder status"
-      register: docker_excluder_status
-      failed_when: false
-
-    # If the docker excluder is installed and the status is non-zero
-    # always enable the docker excluder
-    - name: Override docker excluder enablement if the status is non-zero
-      set_fact:
-        enable_docker_excluder_override: true
-      when:
-      - "{{ docker_excluder_status.rc | default(0) != 0 }}"
-
-    - debug:
-        msg: "Enabling docker excluder"
-      when:
-      - "{{ docker_excluder_status.rc | default(0) != 0 }}"
-
-    # As the docker excluder status is not satisfied,
-    # re-enable entire docker excluder again
-    # At the same time keep the override set in a case other task would
-    - name: Enable docker excluder
-      command: "{{ openshift.common.service_type }}-docker-excluder exclude"
-
-    # Run the docker excluder status even if the excluder is disabled.
-    # In order to determine of the excluder needs to be enabled.
-    when:
-    - "{{ docker_excluder_installed.installed_versions | default([]) | length > 0 }}"
-    - "{{ docker_excluder_on }}"
-
-  when:
-  - not openshift.common.is_atomic | bool
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index 9a883feed..f67aee88b 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -39,7 +39,7 @@
   delegate_to: "{{ openshift_master_host }}"
 
 - name: Set node schedulability
-  oadm_manage_node:
+  oc_adm_manage_node:
     node: "{{ openshift.node.nodename | lower }}"
     schedulable: "{{ 'true' if openshift.node.schedulable | bool else 'false' }}"
   retries: 10