Fix rotate_fernet_keys workflow to not use heat deployment
We've disabled os-collect-config after config-download became the default from rocky. However, this workflow is currently using heat software deployment for deploy_ssh_key task. This changes to use inventory generated by config-download and removes the deploy_ssh_key task. Also fixes swift_ring.v1.reblance to use the correct inventory. Change-Id: Iab9d30e1b5b3008ef3130f64225b4f7fd4082214 Closes-Bug: #1803814
This commit is contained in:
@@ -9,6 +9,7 @@ workflows:
|
||||
|
||||
input:
|
||||
- container
|
||||
- work_dir: /var/lib/mistral
|
||||
- queue_name: tripleo
|
||||
- ansible_extra_env_variables:
|
||||
ANSIBLE_HOST_KEY_CHECKING: 'False'
|
||||
@@ -20,14 +21,6 @@ workflows:
|
||||
|
||||
rotate_keys:
|
||||
action: tripleo.parameters.rotate_fernet_keys container=<% $.container %>
|
||||
on-success: deploy_ssh_key
|
||||
on-error: send_message
|
||||
publish-on-error:
|
||||
status: FAILED
|
||||
message: <% task().result %>
|
||||
|
||||
deploy_ssh_key:
|
||||
workflow: tripleo.validations.v1.copy_ssh_key
|
||||
on-success: get_privkey
|
||||
on-error: send_message
|
||||
publish-on-error:
|
||||
@@ -46,11 +39,11 @@ workflows:
|
||||
action: tripleo.ansible-playbook
|
||||
input:
|
||||
hosts: keystone
|
||||
inventory: /usr/bin/tripleo-ansible-inventory
|
||||
inventory: <% $.get('work_dir') %>/<% $.get('container') %>/tripleo-ansible-inventory.yaml
|
||||
ssh_private_key: <% task(get_privkey).result %>
|
||||
extra_env_variables: <% $.ansible_extra_env_variables + dict(TRIPLEO_PLAN_NAME=>$.container) %>
|
||||
verbosity: 0
|
||||
remote_user: heat-admin
|
||||
remote_user: tripleo-admin
|
||||
become: true
|
||||
extra_vars:
|
||||
fernet_keys: <% task(rotate_keys).result %>
|
||||
|
||||
@@ -9,6 +9,10 @@ workflows:
|
||||
tags:
|
||||
- tripleo-common-managed
|
||||
|
||||
input:
|
||||
- container: overcloud
|
||||
- work_dir: /var/lib/mistral
|
||||
|
||||
tasks:
|
||||
get_private_key:
|
||||
action: tripleo.validations.get_privkey
|
||||
@@ -21,9 +25,9 @@ workflows:
|
||||
input:
|
||||
ssh_private_key: <% task(get_private_key).result %>
|
||||
verbosity: 1
|
||||
remote_user: heat-admin
|
||||
remote_user: tripleo-admin
|
||||
become: true
|
||||
become_user: root
|
||||
playbook: /usr/share/tripleo-common/playbooks/swift_ring_rebalance.yaml
|
||||
inventory: /usr/bin/tripleo-ansible-inventory
|
||||
inventory: <% $.get('work_dir') %>/<% $.get('container') %>/tripleo-ansible-inventory.yaml
|
||||
use_openstack_credentials: true
|
||||
|
||||
Reference in New Issue
Block a user