Simplify octavia post deploy configs
Consolidate post deploy configurations in a single file. Octavia controller services share many configurations. It is best to consolidate them in the same configuration file. This fixes problems seen like amphorae not having the controller_ip_port_list config value set on failover triggered by the Health Manager service as that config was only being loaded for the Worker service. Backport note: this backport also includes https://review.opendev.org/696729/ Depends-On: https://review.opendev.org/#/c/689875/ Closes-Bug: #1836074 Change-Id: I32524f85ef6a0ca3e87fa9acc8c9e12776225717 (cherry picked from commitc2bb9c0937
) (cherry picked from commit25d8177d14
)
This commit is contained in:
parent
61688872a7
commit
6a45e9b37a
|
@ -114,7 +114,7 @@ outputs:
|
|||
config_image: {get_param: DockerOctaviaConfigImage}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/octavia_health_manager.json:
|
||||
command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
|
||||
command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-file /etc/octavia/post-deploy.conf --config-dir /etc/octavia/conf.d/octavia-health-manager
|
||||
config_files:
|
||||
- source: "/var/lib/kolla/config_files/src/*"
|
||||
dest: "/"
|
||||
|
|
|
@ -105,7 +105,7 @@ outputs:
|
|||
config_image: {get_param: DockerOctaviaConfigImage}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/octavia_housekeeping.json:
|
||||
command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
|
||||
command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-file /etc/octavia/post-deploy.conf --config-dir /etc/octavia/conf.d/octavia-housekeeping
|
||||
config_files:
|
||||
- source: "/var/lib/kolla/config_files/src/*"
|
||||
dest: "/"
|
||||
|
|
|
@ -97,7 +97,7 @@ outputs:
|
|||
config_image: {get_param: DockerOctaviaConfigImage}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/octavia_worker.json:
|
||||
command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-worker
|
||||
command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-file /etc/octavia/post-deploy.conf --config-dir /etc/octavia/conf.d/octavia-worker
|
||||
config_files:
|
||||
- source: "/var/lib/kolla/config_files/src/*"
|
||||
dest: "/"
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Fixed an issue where Octavia controller services were not properly
|
||||
configured.
|
Loading…
Reference in New Issue