From 564f8f2bd484181ea46041932befbbe9bc67afb3 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Mon, 9 Nov 2015 03:06:31 +0000
Subject: [PATCH] Move data container to start.yml

The original reason for having the data container in the bootstrap.yml
was to keep consistency with rabbitmq and mariadb, but in light of
this bug we need to move the data container out of the bootstrap.yml
role since we will be limiting the hosts that those tasks can run on.

Change-Id: I7f2f5979b01807275908699d1243756cb97d3588
Partial-Bug: #1513598
---
 ansible/roles/glance/tasks/bootstrap.yml | 18 ------------------
 ansible/roles/glance/tasks/start.yml     | 16 ++++++++++++++++
 ansible/roles/nova/tasks/bootstrap.yml   | 18 ------------------
 ansible/roles/nova/tasks/start.yml       | 18 ++++++++++++++++++
 4 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml
index 77a3914601..663e93f6f7 100644
--- a/ansible/roles/glance/tasks/bootstrap.yml
+++ b/ansible/roles/glance/tasks/bootstrap.yml
@@ -28,22 +28,6 @@
   failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
   run_once: True
 
-- name: Starting Glance 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: glance_data
-    image: "{{ glance_data_image_full }}"
-    volumes: "/var/lib/glance/"
-
 - name: Starting Glance bootstrap container
   docker:
     tty: True
@@ -59,8 +43,6 @@
     name: bootstrap_glance
     image: "{{ glance_api_image_full }}"
     volumes: "{{ node_config_directory }}/glance-api/:{{ container_config_directory }}/:ro"
-    volumes_from:
-     - glance_data
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
diff --git a/ansible/roles/glance/tasks/start.yml b/ansible/roles/glance/tasks/start.yml
index a28e3f3b14..18912b3a5b 100644
--- a/ansible/roles/glance/tasks/start.yml
+++ b/ansible/roles/glance/tasks/start.yml
@@ -1,4 +1,20 @@
 ---
+- name: Starting Glance 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: glance_data
+    image: "{{ glance_data_image_full }}"
+    volumes: "/var/lib/glance/"
+
 - name: Starting Glance-registry container
   docker:
     tty: True
diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml
index 7b7a5ed163..b96f045849 100644
--- a/ansible/roles/nova/tasks/bootstrap.yml
+++ b/ansible/roles/nova/tasks/bootstrap.yml
@@ -27,24 +27,6 @@
   failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
   run_once: True
 
-- name: Starting Nova 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: nova_data
-    image: "{{ nova_data_image_full }}"
-    volumes:
-      - "/var/lib/nova/instances"
-      - "/var/lib/libvirt"
-
 - name: Starting Nova bootstrap container
   docker:
     tty: True
diff --git a/ansible/roles/nova/tasks/start.yml b/ansible/roles/nova/tasks/start.yml
index 84bf107772..0bf843002b 100644
--- a/ansible/roles/nova/tasks/start.yml
+++ b/ansible/roles/nova/tasks/start.yml
@@ -1,4 +1,22 @@
 ---
+- name: Starting Nova 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: nova_data
+    image: "{{ nova_data_image_full }}"
+    volumes:
+      - "/var/lib/nova/instances"
+      - "/var/lib/libvirt"
+
 - name: Starting Nova-libvirt container
   docker:
     tty: True