Remove atomic-openshift-utils

Author: sdodson

.github/ISSUE_TEMPLATE.md

@@ -17,10 +17,9 @@ If you're operating from a **git clone**:
 
 * The output of `git describe`
 
-If you're running from playbooks installed via RPM or
-`atomic-openshift-utils`
+If you're running from playbooks installed via RPM
 
-* The output of `rpm -q atomic-openshift-utils openshift-ansible`
+* The output of `rpm -q openshift-ansible`
 
 Place the output between the code block below:
 

utils/etc/ansible-quiet.cfg etc/ansible-quiet.cfg

@@ -5,7 +5,7 @@ MAINTAINER OpenShift Team <[email protected]>
 USER root
 
 # Playbooks, roles, and their dependencies are installed from packages.
-RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto python2-boto3 python2-crypto openssl java-1.8.0-openjdk-headless httpd-tools google-cloud-sdk" \
+RUN INSTALL_PKGS="openshift-ansible atomic-openshift-clients python-boto python2-boto3 python2-crypto openssl java-1.8.0-openjdk-headless httpd-tools google-cloud-sdk" \
  && yum repolist > /dev/null \
  && yum-config-manager --enable rhel-7-server-ose-3.7-rpms \
  && yum-config-manager --enable rhel-7-server-rh-common-rpms \
@@ -30,7 +30,7 @@ LABEL name="openshift3/ose-ansible" \
 ENV USER_UID=1001 \
     HOME=/opt/app-root/src \
     WORK_DIR=/usr/share/ansible/openshift-ansible \
-    ANSIBLE_CONFIG=/usr/share/atomic-openshift-utils/ansible.cfg \
+    ANSIBLE_CONFIG=/usr/share/ansible/openshift-ansible/ansible.cfg \
     OPTS="-v"
 
 # Add image scripts and files for running as a system container

utils/etc/ansible.cfg etc/ansible.cfg

@@ -6,7 +6,7 @@
         "VAR_LOG_OPENSHIFT_LOG": "/var/log/ansible.log",
         "PLAYBOOK_FILE": "/usr/share/ansible/openshift-ansible/playbooks/deploy_cluster.yml",
 	"HOME_ROOT": "/root",
-	"ANSIBLE_CONFIG": "/usr/share/atomic-openshift-utils/ansible.cfg",
+	"ANSIBLE_CONFIG": "/usr/share/ansible/openshift-ansible/ansible.cfg",
         "INVENTORY_FILE": "/dev/null"
     }
 }

images/installer/Dockerfile.rhel7

@@ -24,6 +24,7 @@ Requires:      tar
 Requires:      %{name}-docs = %{version}-%{release}
 Requires:      %{name}-playbooks = %{version}-%{release}
 Requires:      %{name}-roles = %{version}-%{release}
+Obsoletes:     atomic-openshift-utils <= 3.10
 Requires:      java-1.8.0-openjdk-headless
 Requires:      httpd-tools
 Requires:      libselinux-python
@@ -42,16 +43,13 @@ for Openshift and Atomic Enterprise.
 
 %build
 
-# atomic-openshift-utils install
-pushd utils
-%{__python} setup.py build
-popd
-
 %install
 # Base openshift-ansible install
 mkdir -p %{buildroot}%{_datadir}/%{name}
 mkdir -p %{buildroot}%{_datadir}/ansible/%{name}/inventory
 cp -rp inventory/dynamic %{buildroot}%{_datadir}/ansible/%{name}/inventory
+cp etc/ansible.cfg %{buildroot}%{_datadir}/ansible/%{name}/ansible.cfg
+cp etc/ansible-quiet.cfg %{buildroot}%{_datadir}/ansible/%{name}/ansible-quiet.cfg
 
 # openshift-ansible-bin install
 mkdir -p %{buildroot}%{_bindir}
@@ -83,25 +81,15 @@ rm -rf %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv/*
 # touch a file in contiv so that it can be added to SCM's
 touch %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv/.empty_dir
 
-# atomic-openshift-utils install
-pushd utils
-%{__python} setup.py install --skip-build --root %{buildroot}
-# Remove this line once the name change has happened
-mv -f %{buildroot}%{_bindir}/oo-install %{buildroot}%{_bindir}/atomic-openshift-installer
-mkdir -p %{buildroot}%{_datadir}/atomic-openshift-utils/
-cp etc/ansible.cfg %{buildroot}%{_datadir}/atomic-openshift-utils/ansible.cfg
-mkdir -p %{buildroot}%{_mandir}/man1/
-cp -v docs/man/man1/atomic-openshift-installer.1 %{buildroot}%{_mandir}/man1/
-cp etc/ansible-quiet.cfg %{buildroot}%{_datadir}/atomic-openshift-utils/ansible-quiet.cfg
-popd
-
 # Base openshift-ansible files
 %files
 %doc README*
 %license LICENSE
 %dir %{_datadir}/ansible/%{name}
 %{_datadir}/ansible/%{name}/inventory/dynamic
 %ghost %{_datadir}/ansible/%{name}/playbooks/common/openshift-master/library.rpmmoved
+%{_datadir}/ansible/%{name}/ansible.cfg
+%{_datadir}/ansible/%{name}/ansible-quiet.cfg
 
 # ----------------------------------------------------------------------------------
 # openshift-ansible-docs subpackage
@@ -175,30 +163,6 @@ BuildArch:     noarch
 %files roles
 %{_datadir}/ansible/%{name}/roles
 
-# ----------------------------------------------------------------------------------
-# atomic-openshift-utils subpackage
-# ----------------------------------------------------------------------------------
-
-%package -n atomic-openshift-utils
-Summary:       Atomic OpenShift Utilities
-BuildRequires: python-setuptools
-Requires:      %{name}-playbooks = %{version}-%{release}
-Requires:      python-click
-Requires:      python-setuptools
-Requires:      PyYAML
-BuildArch:     noarch
-
-%description -n atomic-openshift-utils
-Atomic OpenShift Utilities includes
- - atomic-openshift-installer
- - other utilities
-
-%files -n atomic-openshift-utils
-%{python_sitelib}/ooinstall*
-%{_bindir}/atomic-openshift-installer
-%{_datadir}/atomic-openshift-utils/ansible.cfg
-%{_mandir}/man1/*
-%{_datadir}/atomic-openshift-utils/ansible-quiet.cfg
 
 
 %changelog

images/installer/root/exports/manifest.json

@@ -5,4 +5,4 @@
 universal=1
 
 [yamllint]
-excludes=.tox,utils,files
+excludes=.tox,files

openshift-ansible.spec

@@ -179,7 +179,7 @@ class OpenShiftAnsiblePylint(PylintCommand):
     # pylint: disable=no-self-use
     def find_all_modules(self):
         ''' find all python files to test '''
-        exclude_dirs = ('.tox', 'utils', 'test', 'tests', 'git')
+        exclude_dirs = ('.tox', 'test', 'tests', 'git')
         modules = []
         for match in find_files(os.getcwd(), exclude_dirs, None, r'\.py$'):
             package = os.path.basename(match).replace('.py', '')
@@ -222,8 +222,7 @@ def run(self):
         generate_files = find_files('roles',
                                     ['inventory',
                                      'test',
-                                     'playbooks',
-                                     'utils'],
+                                     'playbooks'],
                                     None,
                                     'generate.py$')