starlingx/ansible-playbooks
Code Issues Proposed changes

Merge "Subcloud rehoming support for usm"

Browse Source
This commit is contained in:
Zuul 2024-08-06 13:25:15 +00:00 committed by Gerrit Code Review
commit 9f9245bc68
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbookconfig/src/playbooks/roles/rehome-enroll-common/update-keystone-data/tasks/main.yml
View File

@ -25,6 +25,7 @@
- { username: 'fm', password: "{{ users['fm'] }}", service: 'fm-mgr' }
- { username: 'mtce', password: "{{ users['mtce'] }}", service: 'mtc-agent' }
- { username: 'patching', password: "{{ users['patching'] }}", service: 'sw-patch-controller-daemon' }
- { username: 'usm', password: "{{ users['usm'] }}", service: 'software-controller-daemon' }
- { username: 'vim', password: "{{ users['vim'] }}", service: 'vim' }
- name: Update keystone passwords in secure hieradata

1
playbookconfig/src/playbooks/roles/rehome-enroll-common/update-keystone-data/tasks/migrate_keystone_ids.yml
View File

@ -67,6 +67,7 @@
- "fm-api"
- "sm-api"
- "sw-patch-controller-daemon"
- "software-controller-daemon"
- name: Wait until services are restarted after changing keystone IDs
shell: sm-query service {{ item }} | grep -c enabled-active

10
playbookconfig/src/playbooks/roles/rehome-enroll-common/update-keystone-data/tasks/update_keystone_user_password_for_rehome.yml
View File

@ -81,7 +81,7 @@
until: service_status.stdout == '1'
retries: 6
delay: 10
when: username != 'patching'
when: username != 'patching' and username != 'usm'
- name: Check sw-patch-controller-daemon service status
command: systemctl is-active sw-patch-controller-daemon
@ -91,6 +91,14 @@
delay: 10
when: username == 'patching'
- name: Check software-controller-daemon service status
command: systemctl is-active software-controller-daemon
register: usm_status
until: usm_status.rc == 0
retries: 6
delay: 10
when: username == 'usm'
when: service != 'dcmanager'
when: password_check_result.rc != 0

6
playbookconfig/src/playbooks/roles/rehome-enroll-common/update-keystone-data/tasks/update_secure_hieradata.yml
View File

@ -55,6 +55,12 @@
To: "patching::keystone::auth::password: !!python/unicode '{{ users['patching'] }}'" }
- { From: "^patching::keystone::authtoken::password",
To: "patching::keystone::authtoken::password: !!python/unicode '{{ users['patching'] }}'" }
- { From: "^usm::api::keystone_password",
To: "usm::api::keystone_password: !!python/unicode '{{ users['usm'] }}'" }
- { From: "^usm::keystone::auth::password",
To: "usm::keystone::auth::password: !!python/unicode '{{ users['usm'] }}'" }
- { From: "^usm::keystone::authtoken::password",
To: "usm::keystone::authtoken::password: !!python/unicode '{{ users['usm'] }}'" }
- { From: "^platform::mtce::params::auth_pw",
To: "platform::mtce::params::auth_pw: !!python/unicode '{{ users['mtce'] }}'" }
- { From: "^sysinv::api::keystone_password",