diff options
author | tzumainn <tzumainn@redhat.com> | 2017-09-14 08:57:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-14 08:57:07 -0400 |
commit | d1fd976db8ce51fe3f02aadb512651f8a3593203 (patch) | |
tree | f387bf50deec2aeea8c455c6e0d0ff27534b97d1 | |
parent | 0f7b04e1b445c255113175a4c11e547664a6306f (diff) | |
parent | 5fe8f8cd89da4312f8b8465cde44c01b1db3a1da (diff) | |
download | openshift-d1fd976db8ce51fe3f02aadb512651f8a3593203.tar.gz openshift-d1fd976db8ce51fe3f02aadb512651f8a3593203.tar.bz2 openshift-d1fd976db8ce51fe3f02aadb512651f8a3593203.tar.xz openshift-d1fd976db8ce51fe3f02aadb512651f8a3593203.zip |
Merge pull request #732 from tomassedovic/make-rhsm-registry-optional
Make rhsm registry optional for openstack
-rw-r--r-- | playbooks/provisioning/openstack/pre-install.yml | 2 | ||||
-rw-r--r-- | playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/provisioning/openstack/pre-install.yml b/playbooks/provisioning/openstack/pre-install.yml index 9b49136da..45e9005cc 100644 --- a/playbooks/provisioning/openstack/pre-install.yml +++ b/playbooks/provisioning/openstack/pre-install.yml @@ -9,7 +9,7 @@ - hosts: OSEv3 become: true roles: - - { role: subscription-manager, when: hostvars.localhost.rhsm_register, tags: 'subscription-manager', ansible_sudo: true } + - { role: subscription-manager, when: hostvars.localhost.rhsm_register|default(False), tags: 'subscription-manager', ansible_sudo: true } - { role: docker, tags: 'docker' } - { role: openshift-prep, tags: 'openshift-prep' } diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml index bc186a6b8..12f64f401 100644 --- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml +++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml @@ -77,8 +77,9 @@ docker_volume_size: "15" openstack_subnet_prefix: "192.168.99" -# # Red Hat subscription -rhsm_register: False +## Red Hat subscription defaults to false which means we will not attempt to +## subscribe the nodes +#rhsm_register: False # # Using Red Hat Satellite: #rhsm_register: True |