Merge pull request #11434 from patrickdillon/clean-up-test

Move repo setup into test.

roles/openshift_repos/README.md

@@ -1,38 +0,0 @@
-OpenShift Repos
-================
-
-Configures repositories for an OpenShift installation
-
-Requirements
-------------
-
-A RHEL 7.1 host pre-configured with access to the rhel-7-server-rpms,
-rhel-7-server-extra-rpms, and rhel-7-server-ose-3.0-rpms repos.
-
-Role Variables
---------------
-
-| Name                          | Default value |                                              |
-|-------------------------------|---------------|----------------------------------------------|
-| openshift_deployment_type     | None          | Possible values openshift-enterprise, origin |
-| openshift_additional_repos    | {}            | TODO                                         |
-
-Dependencies
-------------
-
-None.
-
-Example Playbook
-----------------
-
-TODO
-
-License
--------
-
-Apache License, Version 2.0
-
-Author Information
-------------------
-
-TODO

roles/openshift_repos/defaults/main.yaml

@@ -1,3 +0,0 @@
----
-openshift_additional_repos: {}
-openshift_repos_enable_testing: false

roles/openshift_repos/files/origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS

@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-mQENBFc8iwUBCADadBGYmA2nFvq79/5uxUQOiPqC/QflWcPX1B6SQKniUhyqaSes
-gNMJsPppKRV4NZKITcL8lZ90+Gds0fmL3b5xz1r5Rfm3ilSItEqeGlLIJZBvANyx
-rAT3q8EgkkVRyhZPseUMZj04O8OKnt1jrHakVkOp0lJClqhZ+bs/7yLRmaLXTcum
-+ouqUKzQoAEDnqe9nJmmJhC6n2vg7o0PCo/9qOf/scQbv4FNoJfmkcVLRmwmqzgh
-bGj6QaOgij3sl94pZ3HFop4f+eU0kNbyt9J18fKI8X0DdHkDW8kO1UwwHT2ibJ1t
-mBaUsE1zZ0DvfyFad1xXAgm+SIlJgdpPvPNLABEBAAG0WUNlbnRPUyBQYWFTIFNJ
-RyAoaHR0cHM6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lhbEludGVyZXN0R3JvdXAv
-UGFhUykgPHNlY3VyaXR5QGNlbnRvcy5vcmc+iQE5BBMBAgAjBQJXPIsFAhsDBwsJ
-CAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQw0xb1C8pfsyT2gf9FqJoc8oZ+T5A
-8cZslMyCWziPi0o7kd/Rw91T7dkV+VIC+sFlVga7fkPEAiD8U7JFE+a1IlcjfGuY
-my4S6UH8K5zL36CRg2MF112HE5TWoBxF3KZg9nOJQ2NLapJowaP8uITYG4vlgV3g
-GJD2OC191tjcqmelFnhAN0EBdxrRrBJ7tr3OCtL6bJ6NPQ0bXPI2Fjbm7SbxTfpE
-ggEU8R7WZQApYgl8zRfyS12SfpFV8ZU+lIBmJaU1qaY4/BmNgG6e7clmq8xVZQLg
-ZH9qi9+HPh+80+8/WhJUddlVXc2g6c4VjnnFpZfsrMdTAFuEsrjkyaxqeBjXCgbb
-pzGjTg0LXg==
-=CVSF
------END PGP PUBLIC KEY BLOCK-----

roles/openshift_repos/handlers/main.yml

@@ -1,7 +0,0 @@
----
-- name: refresh cache
-  command: "{{ ansible_pkg_mgr }} clean all"
-  args:
-    # Disables the following warning:
-    # Consider using yum module rather than running yum
-    warn: no

roles/openshift_repos/tasks/centos_repos.yml

@@ -1,24 +0,0 @@
----
-# Note: OpenShift repositories under CentOS may be shipped through the
-# "centos-release-openshift-origin" package which configures the repository.
-# This task matches the file names provided by the package so that they are
-# not installed twice in different files and remains idempotent.
-
-- name: Configure origin gpg keys
-  copy:
-    src: "origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS"
-    dest: "/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS"
-  notify: refresh cache
-
-# openshift_version is formatted to a standard string in openshift_version role.
-# openshift_version is expected to be in format 'x.y.z...' here.
-# Here, we drop the '.' characters and try to match the correct repo template
-# for our corresponding openshift_version.
-- name: Configure correct origin release repository
-  template:
-    src: "{{ item }}"
-    dest: "/etc/yum.repos.d/{{ (item | basename | splitext)[0] }}"
-  with_first_found:
-    - "CentOS-OpenShift-Origin{{ ((openshift_version | default('')).split('.')[0:2] | join('')) }}.repo.j2"
-    - "CentOS-OpenShift-Origin.repo.j2"
-  notify: refresh cache

roles/openshift_repos/tasks/main.yaml

@@ -1,62 +0,0 @@
----
-
-# TODO: This needs to be removed and placed into a role
-- name: Ensure libselinux-python is installed
-  package:
-    name: libselinux-python
-    state: present
-  register: result
-  until: result is succeeded
-
-- name: Remove openshift_additional.repo file
-  file:
-    dest: /etc/yum.repos.d/openshift_additional.repo
-    state: absent
-
-- name: Create any additional repos that are defined
-  yum_repository:
-    description: "{{ item.description | default(item.name | default(item.id)) }}"
-    name: "{{ item.name | default(item.id) }}"
-    baseurl: "{{ item.baseurl }}"
-    gpgkey: "{{ item.gpgkey | default(omit)}}"
-    gpgcheck: "{{ item.gpgcheck | default(1) }}"
-    sslverify: "{{ item.sslverify | default(1) }}"
-    sslclientkey: "{{ item.sslclientkey | default(omit) }}"
-    sslclientcert: "{{ item.sslclientcert | default(omit) }}"
-    sslcacert: "{{ item.sslcacert | default(omit) }}"
-    file: "{{ item.name }}"
-    enabled: "{{ item.enabled | default('no')}}"
-  with_items: "{{ openshift_additional_repos }}"
-  when: openshift_additional_repos | length > 0
-  notify: refresh cache
-
-# Singleton block
-- when: r_openshift_repos_has_run is not defined
-  block:
-
-  - include_tasks: rhel_repos.yml
-    when:
-    - ansible_distribution == 'RedHat'
-    - openshift_deployment_type == 'openshift-enterprise'
-    - (rhsub_user is defined and rhsub_pass is defined) or (rhsub_ak is defined and rhsub_orgid is defined)
-
-  - include_tasks: centos_repos.yml
-    when:
-    - ansible_os_family == "RedHat"
-    - ansible_distribution != "Fedora"
-    - openshift_deployment_type == 'origin'
-    - openshift_enable_origin_repo | default(true) | bool
-
-  - name: Ensure clean repo cache in the event repos have been changed manually
-    debug:
-      msg: "First run of openshift_repos"
-    changed_when: true
-    notify: refresh cache
-
-  - name: Record that openshift_repos already ran
-    set_fact:
-      r_openshift_repos_has_run: True
-
-  # Force running ALL handlers now, because we expect repo cache to be cleared
-  # if changes have been made.
-  - meta: flush_handlers

roles/openshift_repos/tasks/rhel_repos.yml

@@ -1,32 +0,0 @@
----
-- name: Discover enabled RHEL rhui repositories
-  command: bash -c "yum -q --noplugins repolist | grep -v 'repo id' | grep 'rhui'"
-  register: repo_rhui
-  changed_when: "repo_rhui.rc != 1"
-  failed_when: repo_rhui.rc == 11
-
-- name: Disable RHEL rhui repositories
-  command: yum-config-manager \
-    --disable 'rhui-REGION-client-config-server-7' \
-    --disable 'rhui-REGION-rhel-server-rh-common' \
-    --disable 'rhui-REGION-rhel-server-releases'
-  when: repo_rhui.changed
-
-- name: Ensure RHEL repositories are enabled
-  command: bash -c "yum -q --noplugins repolist | grep -v 'repo id' | grep 'Red Hat' | wc -l"
-  register: repo_rhel
-  changed_when: "'4' not in repo_rhel.stdout"
-  failed_when: repo_rhel.rc == 11
-
-- name: Disable all repositories
-  command: bash -c "subscription-manager repos --disable='*'"
-  when: repo_rhel.changed
-
-- name: Enable RHEL repositories
-  command: subscription-manager repos \
-               --enable="rhel-7-server-rpms" \
-               --enable="rhel-7-server-extras-rpms" \
-               --enable="rhel-7-server-ose-{{ ( openshift_version ).split('.')[0:2] | join('.') }}-rpms"
-  register: subscribe_repos
-  until: subscribe_repos is succeeded
-  when: repo_rhel.changed

roles/openshift_repos/templates/CentOS-OpenShift-Origin.repo.j2

@@ -1,27 +0,0 @@
-[centos-openshift-origin]
-name=CentOS OpenShift Origin
-baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin-testing]
-name=CentOS OpenShift Origin Testing
-baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin/
-enabled={{ 1 if openshift_repos_enable_testing else 0 }}
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS
-
-[centos-openshift-origin-debuginfo]
-name=CentOS OpenShift Origin DebugInfo
-baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS
-
-[centos-openshift-origin-source]
-name=CentOS OpenShift Origin Source
-baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS

roles/openshift_repos/templates/CentOS-OpenShift-Origin14.repo.j2

@@ -1,27 +0,0 @@
-[centos-openshift-origin14]
-name=CentOS OpenShift Origin
-baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin14/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin14-testing]
-name=CentOS OpenShift Origin Testing
-baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin14/
-enabled={{ 1 if openshift_repos_enable_testing else 0 }}
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin14-debuginfo]
-name=CentOS OpenShift Origin DebugInfo
-baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin14-source]
-name=CentOS OpenShift Origin Source
-baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin14/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS

roles/openshift_repos/templates/CentOS-OpenShift-Origin15.repo.j2

@@ -1,27 +0,0 @@
-[centos-openshift-origin15]
-name=CentOS OpenShift Origin
-baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin15/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin15-testing]
-name=CentOS OpenShift Origin Testing
-baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin15/
-enabled={{ 1 if openshift_repos_enable_testing else 0 }}
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin15-debuginfo]
-name=CentOS OpenShift Origin DebugInfo
-baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin15-source]
-name=CentOS OpenShift Origin Source
-baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin15/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS

roles/openshift_repos/templates/CentOS-OpenShift-Origin310.repo.j2

@@ -1,27 +0,0 @@
-[centos-openshift-origin310]
-name=CentOS OpenShift Origin
-baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin310/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin310-testing]
-name=CentOS OpenShift Origin Testing
-baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin310/
-enabled={{ 1 if openshift_repos_enable_testing else 0 }}
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin310-debuginfo]
-name=CentOS OpenShift Origin DebugInfo
-baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin310-source]
-name=CentOS OpenShift Origin Source
-baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin310/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS

roles/openshift_repos/templates/CentOS-OpenShift-Origin36.repo.j2

@@ -1,27 +0,0 @@
-[centos-openshift-origin36]
-name=CentOS OpenShift Origin
-baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin36/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin36-testing]
-name=CentOS OpenShift Origin Testing
-baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin36/
-enabled={{ 1 if openshift_repos_enable_testing else 0 }}
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin36-debuginfo]
-name=CentOS OpenShift Origin DebugInfo
-baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin36-source]
-name=CentOS OpenShift Origin Source
-baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin36/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS

roles/openshift_repos/templates/CentOS-OpenShift-Origin37.repo.j2

@@ -1,27 +0,0 @@
-[centos-openshift-origin37]
-name=CentOS OpenShift Origin
-baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin37/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin37-testing]
-name=CentOS OpenShift Origin Testing
-baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin37/
-enabled={{ 1 if openshift_repos_enable_testing else 0 }}
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin37-debuginfo]
-name=CentOS OpenShift Origin DebugInfo
-baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-
-[centos-openshift-origin37-source]
-name=CentOS OpenShift Origin Source
-baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin37/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS

test/aws/additional_repos.yml

@@ -0,0 +1,25 @@
+---
+- name: Create any additional repos that are defined
+  yum_repository:
+    description: "{{ item.description | default(item.name | default(item.id)) }}"
+    name: "{{ item.name | default(item.id) }}"
+    baseurl: "{{ item.baseurl }}"
+    gpgkey: "{{ item.gpgkey | default(omit)}}"
+    gpgcheck: "{{ item.gpgcheck | default(1) }}"
+    sslverify: "{{ item.sslverify | default(1) }}"
+    sslclientkey: "{{ item.sslclientkey | default(omit) }}"
+    sslclientcert: "{{ item.sslclientcert | default(omit) }}"
+    sslcacert: "{{ item.sslcacert | default(omit) }}"
+    file: "{{ item.name }}"
+    enabled: "{{ item.enabled | default('no')}}"
+  with_items: "{{ openshift_additional_repos }}"
+  when:
+  - openshift_additional_repos is defined
+  - openshift_additional_repos | length > 0
+
+- name: refresh cache
+  command: "{{ ansible_pkg_mgr }} clean all"
+  args:
+    # Disables the following warning:
+    # Consider using yum module rather than running yum
+    warn: no

test/aws/scaleup.yml

@@ -27,10 +27,7 @@
       group: root
       mode: 0644
   - name: Initialize openshift repos
-    import_role:
-      name: openshift_repos
-    vars:
-      openshift_version: "4.0"
+    import_tasks: additional_repos.yml
 
 - import_playbook: ../../playbooks/scaleup.yml
   vars: