Browse Source

Merge "Simplify octavia post deploy configs" into stable/queens

changes/89/703089/1
Zuul Gerrit Code Review 1 month ago
parent
commit
48089c75da
4 changed files with 8 additions and 3 deletions
  1. +1
    -1
      docker/services/octavia-health-manager.yaml
  2. +1
    -1
      docker/services/octavia-housekeeping.yaml
  3. +1
    -1
      docker/services/octavia-worker.yaml
  4. +5
    -0
      releasenotes/notes/consolidate-octavia-post-deploy-configs-bc251a5446e5615d.yaml

+ 1
- 1
docker/services/octavia-health-manager.yaml View File

@@ -80,7 +80,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: "/"


+ 1
- 1
docker/services/octavia-housekeeping.yaml View File

@@ -76,7 +76,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: "/"


+ 1
- 1
docker/services/octavia-worker.yaml View File

@@ -81,7 +81,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: "/"


+ 5
- 0
releasenotes/notes/consolidate-octavia-post-deploy-configs-bc251a5446e5615d.yaml View File

@@ -0,0 +1,5 @@
---
fixes:
- |
Fixed an issue where Octavia controller services were not properly
configured.

Loading…
Cancel
Save