Skip to content

Commit 8c3cf3a

Browse files
committed
Try not to delete RHEL subscription during ffu
1 parent 400fb1d commit 8c3cf3a

File tree

1 file changed

+70
-0
lines changed
  • installer/step5-upgrade-undercloud-and-overcloud/osp10_osp13

1 file changed

+70
-0
lines changed

installer/step5-upgrade-undercloud-and-overcloud/osp10_osp13/tasks.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,76 @@
198198
BlockStorageCount: {{ overcloud_block_storage_scale }}
199199
ObjectStorageCount: {{ overcloud_swift_storage_scale }}
200200
201+
# 5.11. CONFIGURING REGISTRATION FOR FAST FORWARD
202+
# UPGRADES
203+
204+
- name: Write out environment file to disable rhel registration deletion
205+
copy:
206+
dest: /home/stack/environments/no_delete_rhelsub.yaml
207+
content: |
208+
parameter_defaults:
209+
DeleteOnRHELUnregistration: false
210+
rhel_reg_auto_attach: ""
211+
rhel_reg_activation_key: ""
212+
rhel_reg_org: ""
213+
rhel_reg_pool_id: "{{ rh_sub_pool_id }}"
214+
rhel_reg_repos: "rhel-7-server-rpms,rhel-7-server-extras-rpms,rhel-7-server-rh-common-rpms,\
215+
rhel-ha-for-rhel-7-server-rpms,rhel-7-server-openstack-10-rpms"
216+
rhel_reg_method: "portal"
217+
rhel_reg_sat_repo: ""
218+
rhel_reg_base_url: ""
219+
rhel_reg_environment: ""
220+
rhel_reg_force: ""
221+
rhel_reg_machine_name: ""
222+
rhel_reg_password: "{{ rh_sub_password }}"
223+
rhel_reg_release: ""
224+
rhel_reg_sat_url: ""
225+
rhel_reg_server_url: ""
226+
rhel_reg_service_level: ""
227+
rhel_reg_user: "{{ rh_sub_username }}"
228+
rhel_reg_type: ""
229+
rhel_reg_http_proxy_host: ""
230+
rhel_reg_http_proxy_port: ""
231+
rhel_reg_http_proxy_username: ""
232+
rhel_reg_http_proxy_password: ""
233+
234+
- name: Update the current plan using your original openstack overcloud deploy command
235+
shell: |
236+
source /home/stack/stackrc
237+
openstack overcloud deploy --update-plan-only --templates \
238+
-e /home/stack/environments/overcloud-config.yaml \
239+
-e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
240+
-e /usr/share/openstack-tripleo-heat-templates/environments/net-single-nic-with-vlans.yaml \
241+
-e /home/stack/environments/networking-cisco-config.yaml \
242+
-e /home/stack/environments/no_delete_rhelsub.yaml \
243+
-e /usr/share/openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml \
244+
--ntp-server 1.ntp.esl.cisco.com
245+
246+
- name: Install expect package
247+
yum:
248+
name: expect
249+
state: latest
250+
become: true
251+
252+
- name: Perform a stack update to ensure that the rhelsub changes are picked up
253+
shell: |
254+
set timeout -1
255+
set end -1;
256+
257+
spawn /bin/bash -c "source /home/stack/stackrc && openstack overcloud update stack -i overcloud"
258+
259+
while {$end == -1} {
260+
expect {
261+
"Breakpoint reached" { send -- "\r" }
262+
"update finished with status COMPLETE" { set end [ expr $end + 1 ] }
263+
"update finished with status FAILED" { set end [ expr $end + 2 ] }
264+
}
265+
}
266+
267+
exit $end
268+
args:
269+
executable: /usr/bin/expect
270+
201271
# CHAPTER 6. UPGRADING THE OVERCLOUD
202272

203273
# 6.1. PERFORMING THE FAST FORWARD UPGRADE OF THE

0 commit comments

Comments
 (0)