Remove extra_args from overcloud deploy move to FS 66
These are instead moved to fs 66 [1] which depends-on this patch. In [1] we need to set extra_args conditionally for the d/stream jobs and we can't have extra_args in both places. Also cleans up a task that is no longer needed since we removed the second deployment with [2]. Depends-On: https://review.opendev.org/c/openstack/tripleo-quickstart/+/874594 [1] https://review.opendev.org/c/openstack/tripleo-quickstart/+/874594 [2] https://review.opendev.org/q/topic:oooci_mixed_rhel_job_refactor Change-Id: I0c9541f5fb76238cdffacc997ea7ccebb0d138b5
This commit is contained in:
parent
bcf50bbb68
commit
fd5ac41885
|
@ -11,7 +11,6 @@
|
|||
vars:
|
||||
overcloud_roles: "{{ overcloud_roles_mixed }}"
|
||||
topology_map: "{{ topology_map_mixed }}"
|
||||
extra_args: " --disable-protected-resource-types --baremetal-deployment "
|
||||
tags:
|
||||
- overcloud-deploy
|
||||
|
||||
|
@ -28,24 +27,3 @@
|
|||
debug: var=overcloud_deploy_result
|
||||
failed_when: overcloud_deploy_result == "failed"
|
||||
delegate_to: localhost
|
||||
|
||||
- name: Backup controller logfiles before compute deployment overwrites them
|
||||
hosts: undercloud
|
||||
gather_facts: false
|
||||
vars:
|
||||
backup_ctrl_files:
|
||||
- containers-prepare-parameter.yaml
|
||||
- overcloud_deploy.log
|
||||
- overcloud_roles.yaml
|
||||
- overcloud-topology-config.yaml
|
||||
- overcloud-deploy.sh
|
||||
tags:
|
||||
- overcloud-deploy
|
||||
tasks:
|
||||
- name: Rename controller logfiles so we can keep them
|
||||
copy:
|
||||
remote_src: true
|
||||
src: "/home/zuul/{{ item }}"
|
||||
dest: "/home/zuul/ctrl_{{ item }}"
|
||||
loop: "{{ backup_ctrl_files|flatten }}"
|
||||
failed_when: false
|
||||
|
|
Loading…
Reference in New Issue