aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/cinder/tasks/bootstrap.yml18
-rw-r--r--ansible/roles/cinder/tasks/start.yml1
2 files changed, 1 insertions, 18 deletions
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml
index cf8f43413..1c0790048 100644
--- a/ansible/roles/cinder/tasks/bootstrap.yml
+++ b/ansible/roles/cinder/tasks/bootstrap.yml
@@ -27,22 +27,6 @@
failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
run_once: True
-- name: Starting Cinder data container
- docker:
- tty: True
- net: host
- pull: "{{ docker_pull_policy }}"
- restart_policy: "{{ docker_restart_policy }}"
- restart_policy_retry: "{{ docker_restart_policy_retry }}"
- state: reloaded
- registry: "{{ docker_registry }}"
- username: "{{ docker_registry_username }}"
- password: "{{ docker_registry_password }}"
- insecure_registry: "{{ docker_insecure_registry }}"
- name: cinder_data
- image: "{{ cinder_data_image_full }}"
- volumes: "/var/lib/cinder/"
-
- name: Starting Cinder bootstrap container
docker:
tty: True
@@ -58,8 +42,6 @@
name: bootstrap_cinder
image: "{{ cinder_api_image_full }}"
volumes: "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
- volumes_from:
- - cinder_data
env:
KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml
index 563d3a558..5c30315ef 100644
--- a/ansible/roles/cinder/tasks/start.yml
+++ b/ansible/roles/cinder/tasks/start.yml
@@ -1,3 +1,4 @@
+---
- name: Starting Cinder-api container
docker:
tty: True