diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-09-30 14:26:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 14:26:42 -0400 |
| commit | 1ce3ac9c0f31da7536b0136c0424c33eac379ae4 (patch) | |
| tree | c3a34a47bdc4feb5789750475b858f047f8aa954 /roles | |
| parent | 4f4d3daede9b3c57d4d8142e2479fb86f6936f3f (diff) | |
| parent | 162b56ea3e5764efcd1d7904bd4ee9a67e83d6ba (diff) | |
| download | openshift-1ce3ac9c0f31da7536b0136c0424c33eac379ae4.tar.gz openshift-1ce3ac9c0f31da7536b0136c0424c33eac379ae4.tar.bz2 openshift-1ce3ac9c0f31da7536b0136c0424c33eac379ae4.tar.xz openshift-1ce3ac9c0f31da7536b0136c0424c33eac379ae4.zip | |
Merge pull request #2514 from lhuard1A/rhel_subscribe_ose_3.3
Make rhel_subscribe role default to OpenShift Container Platform 3.3
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/rhel_subscribe/tasks/enterprise.yml | 4 | ||||
| -rw-r--r-- | roles/rhel_subscribe/tasks/main.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml index 8d11276d0..291df6822 100644 --- a/roles/rhel_subscribe/tasks/enterprise.yml +++ b/roles/rhel_subscribe/tasks/enterprise.yml @@ -7,7 +7,7 @@ when: deployment_type == 'enterprise' - set_fact: - default_ose_version: '3.2' + default_ose_version: '3.3' when: deployment_type in ['atomic-enterprise', 'openshift-enterprise'] - set_fact: @@ -16,7 +16,7 @@ - fail: msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type" when: ( deployment_type == 'enterprise' and ose_version not in ['3.0'] ) or - ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2'] ) + ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2', '3.3'] ) - name: Enable RHEL repositories command: subscription-manager repos \ diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml index 343020dce..ba3b9a923 100644 --- a/roles/rhel_subscribe/tasks/main.yml +++ b/roles/rhel_subscribe/tasks/main.yml @@ -4,7 +4,7 @@ # to make it able to enable repositories - set_fact: - rhel_subscription_pool: "{{ lookup('oo_option', 'rhel_subscription_pool') | default(rhsub_pool, True) | default('OpenShift Enterprise, Premium*', True) }}" + rhel_subscription_pool: "{{ lookup('oo_option', 'rhel_subscription_pool') | default(rhsub_pool, True) | default('Red Hat OpenShift Container Platform, Premium*', True) }}" rhel_subscription_user: "{{ lookup('oo_option', 'rhel_subscription_user') | default(rhsub_user, True) | default(omit, True) }}" rhel_subscription_pass: "{{ lookup('oo_option', 'rhel_subscription_pass') | default(rhsub_pass, True) | default(omit, True) }}" rhel_subscription_server: "{{ lookup('oo_option', 'rhel_subscription_server') | default(rhsub_server) }}" |