From 34dac6a02cdf5f6f6eb6bce6e1bc1ad0d05f9f9d Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Sat, 26 Dec 2015 00:12:19 +0000
Subject: [PATCH] Convert cinder to kolla_docker
Change-Id: I2dd889941799f031b3f7be59cbdf4da93f5aa0d0
Partially-Implements: blueprint kolla-docker-module
---
ansible/roles/cinder/tasks/bootstrap.yml | 41 +++--------
ansible/roles/cinder/tasks/start.yml | 86 +++++++-----------------
2 files changed, 32 insertions(+), 95 deletions(-)
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml
index 614420c202..adafe20685 100644
--- a/ansible/roles/cinder/tasks/bootstrap.yml
+++ b/ansible/roles/cinder/tasks/bootstrap.yml
@@ -35,41 +35,18 @@
run_once: True
delegate_to: "{{ groups['cinder-api'][0] }}"
-- name: Starting Cinder bootstrap container
- docker:
- tty: True
+- name: Running Cinder bootstrap container
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
detach: False
- net: host
- pull: "{{ docker_pull_policy }}"
- restart_policy: "no"
- state: reloaded
- registry: "{{ docker_registry }}"
- username: "{{ docker_registry_username }}"
- password: "{{ docker_registry_password }}"
- insecure_registry: "{{ docker_insecure_registry }}"
- name: bootstrap_cinder
- image: "{{ cinder_api_image_full }}"
- volumes: "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
- env:
+ environment:
KOLLA_BOOTSTRAP:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- run_once: True
- delegate_to: "{{ groups['cinder-api'][0] }}"
- when: database_created
-
-# https://github.com/ansible/ansible-modules-core/pull/1031
-- name: Waiting for bootstrap container to exit
- command: docker wait bootstrap_cinder
- failed_when: bootstrap_result.stdout != "0"
- register: bootstrap_result
- run_once: True
- delegate_to: "{{ groups['cinder-api'][0] }}"
- when: database_created
-
-- name: Cleaning up Cinder bootstrap container
- docker:
- name: bootstrap_cinder
+ name: "bootstrap_cinder"
image: "{{ cinder_api_image_full }}"
- state: absent
+ restart_policy: "never"
+ volumes: "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
+ run_once: True
delegate_to: "{{ groups['cinder-api'][0] }}"
when: database_created
diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml
index d7d16df8bb..16bce4ba3b 100644
--- a/ansible/roles/cinder/tasks/start.yml
+++ b/ansible/roles/cinder/tasks/start.yml
@@ -1,87 +1,47 @@
---
-- name: Starting Cinder-api 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_api
+- name: Starting cinder-api container
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
+ name: "cinder_api"
image: "{{ cinder_api_image_full }}"
volumes:
- "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
- env:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-api']
-- name: Starting Cinder-backup 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_backup
+- name: Starting cinder-backup container
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
+ name: "cinder_backup"
image: "{{ cinder_backup_image_full }}"
volumes:
- "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
- env:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-backup']
-- name: Starting Cinder-scheduler 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_scheduler
+- name: Starting cinder-scheduler container
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
+ name: "cinder_scheduler"
image: "{{ cinder_scheduler_image_full }}"
volumes:
- "{{ node_config_directory }}/cinder-scheduler/:{{ container_config_directory }}/:ro"
- "/var/lib/kolla/dev/log:/dev/log"
- env:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-scheduler']
-- name: Starting Cinder-volume 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 }}"
- privileged: True
- name: cinder_volume
+- name: Starting cinder-volume container
+ kolla_docker:
+ action: "start_container"
+ common_options: "{{ docker_common_options }}"
+ name: "cinder_volume"
image: "{{ cinder_volume_image_full }}"
+ privileged: True
volumes:
- "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
+ - "/dev/:/dev/"
+ - "/run/:/run/"
- "/var/lib/kolla/dev/log:/dev/log"
- - /dev/:/dev/
- - /run/:/run/
- env:
- KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
when: inventory_hostname in groups['cinder-volume']
--
GitLab