소스 검색

Merge pull request #732 from tomassedovic/make-rhsm-registry-optional

Make rhsm registry optional for openstack
tzumainn 7 년 전
부모
커밋
d1fd976db8
2개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      playbooks/provisioning/openstack/pre-install.yml
  2. 3 2
      playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml

+ 1 - 1
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' }
 

+ 3 - 2
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