From 2d5704d7927a73aaeb6af1fa0a14427e766fd1e3 Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Thu, 14 Sep 2017 08:57:57 +0200 Subject: Make the `rhsm_register` value optional This was a regression -- it used to be optional (defaulting to False), but among some changes we ended up requiring it again. --- playbooks/provisioning/openstack/pre-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks') 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' } -- cgit v1.2.3 From 5fe8f8cd89da4312f8b8465cde44c01b1db3a1da Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Thu, 14 Sep 2017 09:02:04 +0200 Subject: Remove the `rhsm_register` value from inventory It is now commented out since it's no longer necessary. --- playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'playbooks') 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 -- cgit v1.2.3