Merge "Change restart policy for bootstrap container"

This commit is contained in:
Jenkins 2015-07-07 04:09:11 +00:00 committed by Gerrit Code Review
commit 8a4791ca75
4 changed files with 5 additions and 4 deletions
ansible/roles
database/tasks
keystone/tasks
message-broker/tasks
start.yml

@ -38,13 +38,11 @@
- include: ../../start.yml
vars:
container_environment:
KOLLA_BOOTSTRAP:
container_command: "/bin/sleep infinity"
container_image: "{{ docker_database_image_full }}"
container_name: "mariadb_data"
container_volumes:
- "/var/lib/mysql/"
container_command: "/bin/sleep infinity"
- include: ../../start.yml
vars:
@ -54,6 +52,7 @@
DB_ROOT_PASSWORD: "{{ database_password }}"
container_image: "{{ docker_database_image_full }}"
container_name: "mariadb"
container_restart_policy: "no"
container_volumes:
- "{{ node_config_directory }}/mariadb/:/opt/kolla/mariadb/:ro"
container_volumes_from:

@ -10,5 +10,6 @@
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
container_image: "{{ docker_keystone_image_full }}"
container_name: "bootstrap_keystone"
container_restart_policy: "no"
container_volumes:
- "{{ node_config_directory }}/keystone/:/opt/kolla/keystone/:ro"

@ -24,6 +24,7 @@
RABBITMQ_CLUSTER_COOKIE: "{{ rabbitmq_cluster_cookie }}"
container_image: "{{ docker_message_broker_image_full }}"
container_name: "rabbitmq_bootstrap"
container_restart_policy: "no"
container_volumes:
- "{{ node_config_directory }}/rabbitmq/:/opt/kolla/rabbitmq/:ro"
container_volumes_from:

@ -23,7 +23,7 @@
privileged: "{{ container_privileged | default('False') }}"
pull: "{{ docker_pull_policy }}"
registry: "{{ docker_registry }}"
restart_policy: "{{ docker_restart_policy }}"
restart_policy: "{{ container_restart_policy | default(docker_restart_policy) }}"
restart_policy_retry: "{{ docker_restart_policy_retry }}"
state: "reloaded"
username: "{{ docker_registry_username }}"