diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-18 17:15:19 -0400 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-18 17:23:59 -0400 |
commit | 8613b70503d2d1cbe57ddebc11919edeb26eaadc (patch) | |
tree | 92a6a85e4b8e670ace8c6b518d93807059ddd285 /roles | |
parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
download | openshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.tar.gz openshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.tar.bz2 openshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.tar.xz openshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.zip |
Rename repos role to openshift_repos
- Rename repos role to openshift_repos
- Make openshift_repos a dependency of openshift_common
- Add README and metadata for openshift_repos
- Playbook updates for role rename
- Verify libselinux-python is installed, otherwise some of the bulit-in
modules we use fail
Diffstat (limited to 'roles')
-rw-r--r-- | roles/openshift_common/README.md | 1 | ||||
-rw-r--r-- | roles/openshift_common/meta/main.yml | 1 | ||||
-rw-r--r-- | roles/openshift_repos/README.md | 38 | ||||
-rw-r--r-- | roles/openshift_repos/defaults/main.yaml (renamed from roles/repos/defaults/main.yaml) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/files/online/RPM-GPG-KEY-redhat-beta (renamed from roles/repos/files/online/RPM-GPG-KEY-redhat-beta) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/files/online/RPM-GPG-KEY-redhat-release (renamed from roles/repos/files/online/RPM-GPG-KEY-redhat-release) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/files/online/epel7-kubernetes.repo (renamed from roles/repos/files/online/epel7-kubernetes.repo) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/files/online/epel7-openshift.repo (renamed from roles/repos/files/online/epel7-openshift.repo) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/files/online/oso-rhui-rhel-7-extras.repo (renamed from roles/repos/files/online/oso-rhui-rhel-7-extras.repo) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/files/online/oso-rhui-rhel-7-server.repo (renamed from roles/repos/files/online/oso-rhui-rhel-7-server.repo) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/files/online/rhel-7-libra-candidate.repo (renamed from roles/repos/files/online/rhel-7-libra-candidate.repo) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/meta/main.yml | 14 | ||||
-rw-r--r-- | roles/openshift_repos/tasks/main.yaml (renamed from roles/repos/tasks/main.yaml) | 5 | ||||
-rw-r--r-- | roles/openshift_repos/templates/yum_repo.j2 (renamed from roles/repos/templates/yum_repo.j2) | 0 | ||||
-rw-r--r-- | roles/openshift_repos/vars/main.yml (renamed from roles/repos/vars/main.yml) | 0 |
15 files changed, 59 insertions, 0 deletions
diff --git a/roles/openshift_common/README.md b/roles/openshift_common/README.md index c2ae609ff..a055cb032 100644 --- a/roles/openshift_common/README.md +++ b/roles/openshift_common/README.md @@ -25,6 +25,7 @@ Dependencies ------------ os_firewall +openshift_repos Example Playbook ---------------- diff --git a/roles/openshift_common/meta/main.yml b/roles/openshift_common/meta/main.yml index 88b7677d0..cee4dd337 100644 --- a/roles/openshift_common/meta/main.yml +++ b/roles/openshift_common/meta/main.yml @@ -13,3 +13,4 @@ galaxy_info: - cloud dependencies: - { role: os_firewall } +- { role: openshift_repos } diff --git a/roles/openshift_repos/README.md b/roles/openshift_repos/README.md new file mode 100644 index 000000000..6713e11fc --- /dev/null +++ b/roles/openshift_repos/README.md @@ -0,0 +1,38 @@ +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-beta-rpms repos. + +Role Variables +-------------- + +| Name | Default value | | +|-------------------------------|---------------|----------------------------------------------| +| openshift_deployment_type | online | Possible values enterprise, origin, online | +| openshift_additional_repos | {} | TODO | + +Dependencies +------------ + +None. + +Example Playbook +---------------- + +TODO + +License +------- + +Apache License, Version 2.0 + +Author Information +------------------ + +TODO diff --git a/roles/repos/defaults/main.yaml b/roles/openshift_repos/defaults/main.yaml index 6fe2bf621..6fe2bf621 100644 --- a/roles/repos/defaults/main.yaml +++ b/roles/openshift_repos/defaults/main.yaml diff --git a/roles/repos/files/online/RPM-GPG-KEY-redhat-beta b/roles/openshift_repos/files/online/RPM-GPG-KEY-redhat-beta index 7b40671a4..7b40671a4 100644 --- a/roles/repos/files/online/RPM-GPG-KEY-redhat-beta +++ b/roles/openshift_repos/files/online/RPM-GPG-KEY-redhat-beta diff --git a/roles/repos/files/online/RPM-GPG-KEY-redhat-release b/roles/openshift_repos/files/online/RPM-GPG-KEY-redhat-release index 0f83b622d..0f83b622d 100644 --- a/roles/repos/files/online/RPM-GPG-KEY-redhat-release +++ b/roles/openshift_repos/files/online/RPM-GPG-KEY-redhat-release diff --git a/roles/repos/files/online/epel7-kubernetes.repo b/roles/openshift_repos/files/online/epel7-kubernetes.repo index 1deae2939..1deae2939 100644 --- a/roles/repos/files/online/epel7-kubernetes.repo +++ b/roles/openshift_repos/files/online/epel7-kubernetes.repo diff --git a/roles/repos/files/online/epel7-openshift.repo b/roles/openshift_repos/files/online/epel7-openshift.repo index c7629872d..c7629872d 100644 --- a/roles/repos/files/online/epel7-openshift.repo +++ b/roles/openshift_repos/files/online/epel7-openshift.repo diff --git a/roles/repos/files/online/oso-rhui-rhel-7-extras.repo b/roles/openshift_repos/files/online/oso-rhui-rhel-7-extras.repo index cfe41f691..cfe41f691 100644 --- a/roles/repos/files/online/oso-rhui-rhel-7-extras.repo +++ b/roles/openshift_repos/files/online/oso-rhui-rhel-7-extras.repo diff --git a/roles/repos/files/online/oso-rhui-rhel-7-server.repo b/roles/openshift_repos/files/online/oso-rhui-rhel-7-server.repo index ddc93193d..ddc93193d 100644 --- a/roles/repos/files/online/oso-rhui-rhel-7-server.repo +++ b/roles/openshift_repos/files/online/oso-rhui-rhel-7-server.repo diff --git a/roles/repos/files/online/rhel-7-libra-candidate.repo b/roles/openshift_repos/files/online/rhel-7-libra-candidate.repo index b4215679f..b4215679f 100644 --- a/roles/repos/files/online/rhel-7-libra-candidate.repo +++ b/roles/openshift_repos/files/online/rhel-7-libra-candidate.repo diff --git a/roles/openshift_repos/meta/main.yml b/roles/openshift_repos/meta/main.yml new file mode 100644 index 000000000..cc18c453c --- /dev/null +++ b/roles/openshift_repos/meta/main.yml @@ -0,0 +1,14 @@ +--- +galaxy_info: + author: TODO + description: OpenShift Repositories + company: Red Hat, Inc. + license: Apache License, Version 2.0 + min_ansible_version: 1.7 + platforms: + - name: EL + versions: + - 7 + categories: + - cloud +dependencies: [] diff --git a/roles/repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index 43786da41..6219c4906 100644 --- a/roles/repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -8,6 +8,11 @@ - fail: msg="OpenShift Origin support is not currently enabled" when: openshift_deployment_type == 'origin' +- name: Ensure libselinux-python is installed + yum: + pkg: libselinux-python + state: present + - name: Create any additional repos that are defined template: src: yum_repo.j2 diff --git a/roles/repos/templates/yum_repo.j2 b/roles/openshift_repos/templates/yum_repo.j2 index 7ea2c7460..7ea2c7460 100644 --- a/roles/repos/templates/yum_repo.j2 +++ b/roles/openshift_repos/templates/yum_repo.j2 diff --git a/roles/repos/vars/main.yml b/roles/openshift_repos/vars/main.yml index bbb4c77e7..bbb4c77e7 100644 --- a/roles/repos/vars/main.yml +++ b/roles/openshift_repos/vars/main.yml |