diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-12-01 12:14:20 +0100 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-12-01 12:18:19 +0100 |
| commit | 9562adf37d853dd03531fde7b14e249736e10d88 (patch) | |
| tree | 742c3d3896ac0d857f800b31253388408da271b0 /roles/rhel_subscribe/tasks/enterprise.yml | |
| parent | fdf3edec3f880d21e19e2007065be3ed0ed59a13 (diff) | |
| download | openshift-9562adf37d853dd03531fde7b14e249736e10d88.tar.gz openshift-9562adf37d853dd03531fde7b14e249736e10d88.tar.bz2 openshift-9562adf37d853dd03531fde7b14e249736e10d88.tar.xz openshift-9562adf37d853dd03531fde7b14e249736e10d88.zip | |
Remove reading shell environment in rhel_subscribe
The rhel_subscribe role used to read the shell environment variables for
its input with a broken fallback to Ansible variables.
This updates the role to only use Ansible vars. If the user wants to do
an env lookup, they can do so when calling the role.
Diffstat (limited to 'roles/rhel_subscribe/tasks/enterprise.yml')
| -rw-r--r-- | roles/rhel_subscribe/tasks/enterprise.yml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml index fa74c9953..55e535d61 100644 --- a/roles/rhel_subscribe/tasks/enterprise.yml +++ b/roles/rhel_subscribe/tasks/enterprise.yml @@ -2,18 +2,11 @@ - 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" when: - deployment_type == 'openshift-enterprise' - - ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] ) + - ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] - name: Enable RHEL repositories command: subscription-manager repos \ |