diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-08 13:49:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 13:49:42 -0500 |
| commit | 091acb2cd3d0ab2a6019d9e96a22e6fed1c0ca9a (patch) | |
| tree | 4d40cbce663f6a54328fa4c023d78fec74869556 /roles/rhel_subscribe/tasks/enterprise.yml | |
| parent | b601aa0ce8e7458ee795a7dff7321c70a9b2fcc7 (diff) | |
| parent | 8dc93851db2e44425d3cec0362623680e06c90bc (diff) | |
| download | openshift-091acb2cd3d0ab2a6019d9e96a22e6fed1c0ca9a.tar.gz openshift-091acb2cd3d0ab2a6019d9e96a22e6fed1c0ca9a.tar.bz2 openshift-091acb2cd3d0ab2a6019d9e96a22e6fed1c0ca9a.tar.xz openshift-091acb2cd3d0ab2a6019d9e96a22e6fed1c0ca9a.zip | |
Merge pull request #6323 from tomassedovic/rhel-subscribe
Remove reading shell environment in rhel_subscribe
Diffstat (limited to 'roles/rhel_subscribe/tasks/enterprise.yml')
| -rw-r--r-- | roles/rhel_subscribe/tasks/enterprise.yml | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml index fa74c9953..8acdfb969 100644 --- a/roles/rhel_subscribe/tasks/enterprise.yml +++ b/roles/rhel_subscribe/tasks/enterprise.yml @@ -1,25 +1,18 @@ --- -- name: Disable all repositories - command: subscription-manager repos --disable="*" - -- set_fact: - default_ose_version: '3.6' - when: deployment_type == 'openshift-enterprise' - - set_fact: - ose_version: "{{ lookup('env', 'ose_version') | default(default_ose_version, True) }}" - -- fail: - msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type" + openshift_release: "{{ openshift_release[1:] }}" when: - - deployment_type == 'openshift-enterprise' - - ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] ) + - openshift_release is defined + - openshift_release[0] == 'v' + +- name: Disable all repositories + command: subscription-manager repos --disable="*" - name: Enable RHEL repositories command: subscription-manager repos \ --enable="rhel-7-server-rpms" \ --enable="rhel-7-server-extras-rpms" \ - --enable="rhel-7-server-ose-{{ ose_version }}-rpms" \ + --enable="rhel-7-server-ose-{{ (openshift_release | default('')).split('.')[0:2] | join('.') }}-rpms" \ --enable="rhel-7-fast-datapath-rpms" register: subscribe_repos until: subscribe_repos | succeeded |