diff options
| author | Sam Yaple <sam@yaple.net> | 2015-07-05 12:13:18 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-05 12:13:18 +0000 |
| commit | 1d6e6899f605a034474e4ff1e84ca738fc5231ca (patch) | |
| tree | 84662d8c692ae3049a84f3a3020610f5132d4135 | |
| parent | 2fe35c25bf31873c253e495eee04fd15154f43d2 (diff) | |
| download | kolla-1d6e6899f605a034474e4ff1e84ca738fc5231ca.tar.gz kolla-1d6e6899f605a034474e4ff1e84ca738fc5231ca.zip | |
Change restart policy for bootstrap container
Sets the restart policy to 'no' for bootstrap containers
Change-Id: I1044fdc70a6b7d50396fd923b6be67bd7c47faa2
Closes-Bug: 1471536
| -rw-r--r-- | ansible/roles/database/tasks/bootstrap.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/keystone/tasks/bootstrap.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/message-broker/tasks/bootstrap.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/start.yml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/ansible/roles/database/tasks/bootstrap.yml b/ansible/roles/database/tasks/bootstrap.yml index 4a46ee7cb..6653ebbd7 100644 --- a/ansible/roles/database/tasks/bootstrap.yml +++ b/ansible/roles/database/tasks/bootstrap.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: diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index 0e4c98ca4..98610db34 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -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" diff --git a/ansible/roles/message-broker/tasks/bootstrap.yml b/ansible/roles/message-broker/tasks/bootstrap.yml index 3cc2d51e5..df974055b 100644 --- a/ansible/roles/message-broker/tasks/bootstrap.yml +++ b/ansible/roles/message-broker/tasks/bootstrap.yml @@ -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: diff --git a/ansible/roles/start.yml b/ansible/roles/start.yml index 4925ba363..4e202da3e 100644 --- a/ansible/roles/start.yml +++ b/ansible/roles/start.yml @@ -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 }}" |