From 79f4883cc8a7c1696ae7a4df2d334c0e97ab4cac Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Tue, 5 Jan 2016 18:10:31 +0000
Subject: [PATCH] Allow neutron role to pull images

Change-Id: I81b75f51937c0365cfc3b7066d5f418a8bacd7ea
Partially-Implements: blueprint pre-pull-images
---
 ansible/roles/neutron/tasks/deploy.yml | 24 +++++++++++++
 ansible/roles/neutron/tasks/main.yml   | 24 +------------
 ansible/roles/neutron/tasks/pull.yml   | 50 ++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 23 deletions(-)
 create mode 100644 ansible/roles/neutron/tasks/deploy.yml
 create mode 100644 ansible/roles/neutron/tasks/pull.yml

diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml
new file mode 100644
index 0000000000..19bf5d384e
--- /dev/null
+++ b/ansible/roles/neutron/tasks/deploy.yml
@@ -0,0 +1,24 @@
+---
+# enforce ironic usage only with openvswtich
+- include: ironic-check.yml
+
+- include: register.yml
+  when: inventory_hostname in groups['neutron-server']
+
+- include: config.yml
+  when: inventory_hostname in groups['compute'] or
+        inventory_hostname in groups['neutron-agents'] or
+        inventory_hostname in groups['neutron-server']
+
+- include: config-neutron-fake.yml
+  when:
+    - inventory_hostname in groups['compute']
+    - enable_nova_fake | bool
+
+- include: bootstrap.yml
+  when: inventory_hostname in groups['neutron-server']
+
+- include: start.yml
+  when: inventory_hostname in groups['compute'] or
+        inventory_hostname in groups['neutron-agents'] or
+        inventory_hostname in groups['neutron-server']
diff --git a/ansible/roles/neutron/tasks/main.yml b/ansible/roles/neutron/tasks/main.yml
index 19bf5d384e..b017e8b4ad 100644
--- a/ansible/roles/neutron/tasks/main.yml
+++ b/ansible/roles/neutron/tasks/main.yml
@@ -1,24 +1,2 @@
 ---
-# enforce ironic usage only with openvswtich
-- include: ironic-check.yml
-
-- include: register.yml
-  when: inventory_hostname in groups['neutron-server']
-
-- include: config.yml
-  when: inventory_hostname in groups['compute'] or
-        inventory_hostname in groups['neutron-agents'] or
-        inventory_hostname in groups['neutron-server']
-
-- include: config-neutron-fake.yml
-  when:
-    - inventory_hostname in groups['compute']
-    - enable_nova_fake | bool
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['neutron-server']
-
-- include: start.yml
-  when: inventory_hostname in groups['compute'] or
-        inventory_hostname in groups['neutron-agents'] or
-        inventory_hostname in groups['neutron-server']
+- include: "{{ action }}.yml"
diff --git a/ansible/roles/neutron/tasks/pull.yml b/ansible/roles/neutron/tasks/pull.yml
new file mode 100644
index 0000000000..01c77d2786
--- /dev/null
+++ b/ansible/roles/neutron/tasks/pull.yml
@@ -0,0 +1,50 @@
+---
+- name: Pulling neutron-agents image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ neutron_agents_image_full }}"
+  when: inventory_hostname in groups['neutron-agents']
+
+- name: Pulling neutron-linuxbridge-agent image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ neutron_linuxbridge_agent_image_full }}"
+  when:
+    - (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
+    - neutron_plugin_agent == "linuxbridge"
+
+- name: Pulling neutron-openvswitch-agent image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ neutron_openvswitch_agent_image_full }}"
+  when:
+    - (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
+    - neutron_plugin_agent == "openvswitch"
+
+- name: Pulling neutron-server image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ neutron_server_image_full }}"
+  when: inventory_hostname in groups['neutron-server']
+
+- name: Pulling openvswitch-db image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ openvswitch_db_image_full }}"
+  when:
+    - (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
+    - neutron_plugin_agent == "openvswitch"
+
+- name: Pulling openvswitch-vswitchd image
+  kolla_docker:
+    action: "pull_image"
+    common_options: "{{ docker_common_options }}"
+    image: "{{ openvswitch_vswitchd_image_full }}"
+  when:
+    - (inventory_hostname in groups['compute'] or inventory_hostname in groups['neutron-agents'])
+    - neutron_plugin_agent == "openvswitch"