openstack/kolla-ansible
Code Issues Proposed changes

Change restart policy for bootstrap container

Browse Source 
Sets the restart policy to 'no' for bootstrap containers

Change-Id: I1044fdc70a6b7d50396fd923b6be67bd7c47faa2
Closes-Bug: 1471536
This commit is contained in:
Sam Yaple 2015-07-05 12:13:18 +00:00
parent 2fe35c25bf
commit 1d6e6899f6
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/database/tasks/bootstrap.yml
View File

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

1
ansible/roles/keystone/tasks/bootstrap.yml
View File

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

1
ansible/roles/message-broker/tasks/bootstrap.yml
View File

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

2
ansible/roles/start.yml
View File

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