From a86cb4eb006e41b283feae85c99257096e3ce24b Mon Sep 17 00:00:00 2001
From: "Simental Magana, Marcos" <marcos.simental.magana@intel.com>
Date: Tue, 1 Nov 2016 16:53:47 -0600
Subject: [PATCH] ciao-deploy: delegate the file edits out of the container

By delegating the cluster configuration out of the
container, those will be persistent, allowing the user to
keep them for a future reference/re-deployment.

Signed-off-by: Simental Magana, Marcos <marcos.simental.magana@intel.com>
---
 ciao-deploy/Dockerfile |  1 -
 ciao-deploy/README.md  | 31 +++++++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ciao-deploy/Dockerfile b/ciao-deploy/Dockerfile
index de995b8..a81b1de 100644
--- a/ciao-deploy/Dockerfile
+++ b/ciao-deploy/Dockerfile
@@ -6,7 +6,6 @@ ENV HOME=/root/
 
 RUN swupd bundle-add cryptography sysadmin-hostmgmt go-basic c-basic openstack-common $swupd_args
 
-RUN cp -r /usr/share/ansible/examples/ciao /root/
 RUN ansible-galaxy install -r /root/ciao/requirements.yml --ignore-certs
 
 RUN rm -rf /var/lib/swupd
diff --git a/ciao-deploy/README.md b/ciao-deploy/README.md
index 0597784..c7ca61f 100644
--- a/ciao-deploy/README.md
+++ b/ciao-deploy/README.md
@@ -17,28 +17,39 @@ Or just pull it from Dockerhub
 docker pull clearlinux/ciao-deploy
 ```
 
+Clone the ciao example deployment
+---------------------------------
+```
+git clone https://github.com/clearlinux/clear-config-management.git
+```
+
+Setup your cluster configuration
+--------------------------------
+You may need to edit `clear-config-management/examples/ciao/group_vars/all`
+and `clear-config-management/examples/ciao/hosts` to suit your cluster
+setup needs.
+
+For more detailed instructions you may want to check
+[Deploying ciao via automation](https://clearlinux.org/documentation/ciao-deploy.html)
+documentation.
+
 Run the Ciao-deploy Container
 ----------------------------
 ```
-docker run -it clearlinux/ciao-deploy
+docker run -v $(pwd)/clear-config-management/examples/ciao:/root/ciao \
+    -it clearlinux/ciao-deploy
+
 ```
 
 If you have setup your ssh key for the ansible setup, you may want to use it
 in your ciao-deploy container:
 
 ```
-docker run -v /path/to/your/.ssh/key:/root/.ssh/key \
+docker run -v $(pwd)/clear-config-management/examples/ciao:/root/ciao \
+    -v /path/to/your/.ssh/key:/root/.ssh/key \
     -it clearlinux/ciao-deploy
 ```
 
-Setup your cluster configuration
---------------------------------
-You may need to edit `/root/ciao/group_vars/all` and `/root/ciao/hosts` to
-suit your cluster setup needs.
-
-For more detailed instructions you may want to check
-[Deploying ciao via automation](https://clearlinux.org/documentation/ciao-deploy.html)
-documentation.
 
 Extra Build ARGs
 ----------------