Revert "Create post-deploy.conf on update/upgrade for octavia"
This reverts commit d3826e9ec3
.
Breaks deployment!
Closes-Bug: #1905036
Change-Id: I0c04ade76e7db382a07829567d1cf56bbd0a061a
This commit is contained in:
parent
f268f9757b
commit
e77a59b411
|
@ -403,9 +403,7 @@ outputs:
|
||||||
content: |
|
content: |
|
||||||
d /run/octavia 0755 root root - -
|
d /run/octavia 0755 root root - -
|
||||||
update_tasks:
|
update_tasks:
|
||||||
list_concat:
|
- name: octavia_api_tmpfile_cleanup
|
||||||
- {get_attr: [OctaviaBase, update_tasks]}
|
|
||||||
- - name: octavia_api_tmpfile_cleanup
|
|
||||||
when: step|int == 1
|
when: step|int == 1
|
||||||
block: &octavia_api_tmpfile_cleanup
|
block: &octavia_api_tmpfile_cleanup
|
||||||
- name: octavia_api_tmpfile_cleanup
|
- name: octavia_api_tmpfile_cleanup
|
||||||
|
@ -446,11 +444,8 @@ outputs:
|
||||||
- name: reload systemd
|
- name: reload systemd
|
||||||
systemd:
|
systemd:
|
||||||
daemon-reload: yes
|
daemon-reload: yes
|
||||||
|
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
list_concat:
|
- name: octavia_api_tmpfile_cleanup
|
||||||
- {get_attr: [OctaviaBase, upgrade_tasks]}
|
|
||||||
- - name: octavia_api_tmpfile_cleanup
|
|
||||||
when: step|int == 1
|
when: step|int == 1
|
||||||
block: *octavia_api_tmpfile_cleanup
|
block: *octavia_api_tmpfile_cleanup
|
||||||
- name: Set internal tls variable
|
- name: Set internal tls variable
|
||||||
|
|
|
@ -308,19 +308,3 @@ outputs:
|
||||||
- octavia_client_cert_unset
|
- octavia_client_cert_unset
|
||||||
- {}
|
- {}
|
||||||
- octavia::certificates::client_cert_data: {get_param: OctaviaClientCert}
|
- octavia::certificates::client_cert_data: {get_param: OctaviaClientCert}
|
||||||
update_tasks: &ensure_start_up_files
|
|
||||||
- name: make sure that post-deploy.conf exists before restarting containers on update or upgrade
|
|
||||||
block:
|
|
||||||
- name: check for octavia post-deploy.conf file
|
|
||||||
stat:
|
|
||||||
path: /var/lib/config-data/puppet-generated/octavia/etc/octavia/post-deploy.conf
|
|
||||||
register: octavia_post_deploy_stat
|
|
||||||
- name: create an empty post-deploy.conf file if it does not exist
|
|
||||||
file:
|
|
||||||
path: /var/lib/config-data/puppet-generated/octavia/etc/octavia/post-deploy.conf
|
|
||||||
state: touch
|
|
||||||
setype: container_file_t
|
|
||||||
mode: '0755'
|
|
||||||
when:
|
|
||||||
- octavia_post_deploy_stat.exists is defined and not octavia_post_deploy_stat.exists
|
|
||||||
upgrade_tasks: *ensure_start_up_files
|
|
||||||
|
|
|
@ -195,8 +195,7 @@ outputs:
|
||||||
environment:
|
environment:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
- {}
|
- {}
|
||||||
update_tasks: {get_attr: [OctaviaBase, update_tasks]}
|
|
||||||
upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}
|
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
- name: create persistent directories
|
- name: create persistent directories
|
||||||
file:
|
file:
|
||||||
|
|
|
@ -147,8 +147,6 @@ outputs:
|
||||||
- /var/log/containers/octavia:/var/log/octavia:z
|
- /var/log/containers/octavia:/var/log/octavia:z
|
||||||
environment:
|
environment:
|
||||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
update_tasks: {get_attr: [OctaviaBase, update_tasks]}
|
|
||||||
upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}
|
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
- name: create persistent directories
|
- name: create persistent directories
|
||||||
file:
|
file:
|
||||||
|
@ -158,3 +156,4 @@ outputs:
|
||||||
mode: "{{ item.mode }}"
|
mode: "{{ item.mode }}"
|
||||||
with_items:
|
with_items:
|
||||||
- { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
|
- { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
|
||||||
|
upgrade_tasks: []
|
||||||
|
|
|
@ -167,5 +167,4 @@ outputs:
|
||||||
name: virt_sandbox_use_netlink
|
name: virt_sandbox_use_netlink
|
||||||
persistent: yes
|
persistent: yes
|
||||||
state: yes
|
state: yes
|
||||||
update_tasks: {get_attr: [OctaviaBase, update_tasks]}
|
upgrade_tasks: []
|
||||||
upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}
|
|
||||||
|
|
Loading…
Reference in New Issue