openstack
/
tripleo-upgrade
Code Issues Proposed changes

Change overcloud ssh user from heat-admin to tripleo-admin 

Heat-admin user was dropped completely for overcloud deploy, update and upgrade playbooks[1] and for config-downloaded playbooks as well[2].

[1] https://review.opendev.org/c/openstack/python-tripleoclient/+/850098/2
[2] https://review.opendev.org/c/openstack/python-tripleoclient/+/849780/4


Closes: OSP-19513
Change-Id: I37e4cc33d78288f7b507fc07918b20fefd1c0d33
This commit is contained in:
mcgonago 2022-12-13 11:32:15 -05:00 committed by Owen McGonagle
parent ca284f8785
commit e74225cd9e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/common/load_roles_from_inventory.yaml
View File

@ -38,7 +38,7 @@
# need to start always by the bootstrap node for Pacemaker.
- name: Retrieve the pacemaker bootstrap controller node.
shell: "sudo hiera -c /etc/puppet/hiera.yaml pacemaker_short_bootstrap_node_name"
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'heat-admin') }}"
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'tripleo-admin') }}"
delegate_to: "{{ inventory_hostmap[controller_role_name]|first }}"
register: pcmkr_bootstrap_node_out
when:

4
tasks/update/disable_fencing.yaml
View File

@ -1,7 +1,7 @@
---
- name: verify if fencing is enabled before running overcloud update
become: true
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'heat-admin') }}"
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'tripleo-admin') }}"
delegate_to: "{{ controller_host }}"
shell: "sudo pcs property config stonith-enabled | tail -1"
register: pcs_out
@ -17,7 +17,7 @@
- name: disable fencing before running update
become: true
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'heat-admin') }}"
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'tripleo-admin') }}"
delegate_to: "{{ controller_host }}"
shell: "sudo pcs property set stonith-enabled=false"
when: pcs_out.stdout.find('true') != -1

4
tasks/update/enable_fencing.yaml
View File

@ -6,7 +6,7 @@
- name: verify the fencing status after update
become: true
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'heat-admin') }}"
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'tripleo-admin') }}"
delegate_to: "{{ controller_host }}"
shell: "sudo pcs property config stonith-enabled | tail -1"
register: pcs_out
@ -22,7 +22,7 @@
- name: enable fencing after running update
become: true
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'heat-admin') }}"
become_user: "{{ (overcloud_ssh_user) | ternary(overcloud_ssh_user, 'tripleo-admin') }}"
delegate_to: "{{ controller_host }}"
shell: "sudo pcs property set stonith-enabled=true"
when: pcs_out.stdout.find('false') != -1 and fencing_file.stat.exists