Browse Source

Merge "Apply stop period for paunch-managed stateful svcs"

changes/98/639798/1
Zuul 2 years ago
committed by Gerrit Code Review
parent
commit
814cf04b82
  1. 1
      deployment/messaging/rpc-qdrouterd-container-puppet.yaml
  2. 1
      deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
  3. 1
      deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
  4. 3
      docker/services/database/mysql.yaml
  5. 1
      docker/services/database/redis.yaml

1
deployment/messaging/rpc-qdrouterd-container-puppet.yaml

@ -127,6 +127,7 @@ outputs:
command: ['/bin/bash', '-c', 'chown -R qdrouterd:qdrouterd /var/log/qdrouterd']
qdrouterd:
start_order: 1
stop_grace_period: 60
image: *qdrouterd_image
net: host
user: qdrouterd

1
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml

@ -242,6 +242,7 @@ outputs:
- {get_param: [DefaultPasswords, rabbit_cookie]}
rabbitmq:
start_order: 2
stop_grace_period: 60
image: *rabbitmq_image
net: host
privileged: false

1
deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

@ -242,6 +242,7 @@ outputs:
- {get_param: [DefaultPasswords, rabbit_cookie]}
rabbitmq:
start_order: 2
stop_grace_period: 60
image: *rabbitmq_image
net: host
privileged: false

3
docker/services/database/mysql.yaml

@ -98,7 +98,7 @@ outputs:
config_image: &mysql_config_image {get_param: DockerMysqlConfigImage}
kolla_config:
/var/lib/kolla/config_files/mysql.json:
command: /usr/bin/mysqld_safe
command: /usr/libexec/mysqld --user=mysql
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
@ -191,6 +191,7 @@ outputs:
- {get_param: [DefaultPasswords, mysql_root_password]}
mysql:
start_order: 2
stop_grace_period: 60
image: *mysql_image
restart: unless-stopped
net: host

1
docker/services/database/redis.yaml

@ -113,6 +113,7 @@ outputs:
command: ['/bin/bash', '-c', 'chown -R redis:redis /var/log/redis']
- redis:
start_order: 1
stop_grace_period: 60
image: *redis_image
net: host
privileged: false

Loading…
Cancel
Save