From cad6e422177998fa6b46f2d3e9127ce291128c81 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Wed, 2 May 2018 11:08:24 +1200
Subject: [PATCH] Rename the main task to modify_image.yaml

There will be other tasks in this role.
---
 README.md              |  1 +
 tasks/main.yml         | 29 +----------------------------
 tasks/modify_image.yml | 28 ++++++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 tasks/modify_image.yml

diff --git a/README.md b/README.md
index 86591d6..bbefcc1 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ The following playbook will produce a modified image tagged with
       - name: include tripleo-modify-image
         import_role:
           name: tripleo-modify-image
+          tasks_from: modify_image.yml
         vars:
           source_image: docker.io/tripleomaster/centos-binary-nova-api:latest
           modify_dir_path: /path/to/example_modify_dir
diff --git a/tasks/main.yml b/tasks/main.yml
index 329f0e5..ed97d53 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,28 +1 @@
-- name: Copy Dockerfile to Dockerfile.modified
-  copy:
-    src: "{{ modify_dir_path }}/Dockerfile"
-    dest: "{{ modify_dir_path }}/Dockerfile.modified"
-
-- name: Set default modified_append_tag
-  set_fact:
-    modified_append_tag: "{{ lookup('pipe','date +-modified-%Y%m%d%H%M%S') }}"
-  when: modified_append_tag is undefined or modified_append_tag == None
-
-- name: Replace FROM directive
-  lineinfile:
-    path: "{{ modify_dir_path }}/Dockerfile.modified"
-    regexp: "^FROM "
-    line: "FROM {{ source_image }}"
-
-- name: Add LABEL modified_append_tag={{ modified_append_tag }}
-  lineinfile:
-    path: "{{ modify_dir_path }}/Dockerfile.modified"
-    insertafter: "^FROM "
-    line: "LABEL modified_append_tag={{ modified_append_tag }}"
-
-- name: Modify image  
-  docker_image:
-    name: "{{ modified_image }}{{ modified_append_tag }}"
-    path: "{{ modify_dir_path }}"
-    dockerfile: Dockerfile.modified
-
+---
diff --git a/tasks/modify_image.yml b/tasks/modify_image.yml
new file mode 100644
index 0000000..329f0e5
--- /dev/null
+++ b/tasks/modify_image.yml
@@ -0,0 +1,28 @@
+- name: Copy Dockerfile to Dockerfile.modified
+  copy:
+    src: "{{ modify_dir_path }}/Dockerfile"
+    dest: "{{ modify_dir_path }}/Dockerfile.modified"
+
+- name: Set default modified_append_tag
+  set_fact:
+    modified_append_tag: "{{ lookup('pipe','date +-modified-%Y%m%d%H%M%S') }}"
+  when: modified_append_tag is undefined or modified_append_tag == None
+
+- name: Replace FROM directive
+  lineinfile:
+    path: "{{ modify_dir_path }}/Dockerfile.modified"
+    regexp: "^FROM "
+    line: "FROM {{ source_image }}"
+
+- name: Add LABEL modified_append_tag={{ modified_append_tag }}
+  lineinfile:
+    path: "{{ modify_dir_path }}/Dockerfile.modified"
+    insertafter: "^FROM "
+    line: "LABEL modified_append_tag={{ modified_append_tag }}"
+
+- name: Modify image  
+  docker_image:
+    name: "{{ modified_image }}{{ modified_append_tag }}"
+    path: "{{ modify_dir_path }}"
+    dockerfile: Dockerfile.modified
+