From: Sébastien Han <sebastien.han@enovance.com>
Date: Mon, 5 Jan 2015 23:21:16 +0000 (+0100)
Subject: Fix the vagrant deployment
X-Git-Tag: v1.0.0~286^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F167%2Fhead;p=ceph-ansible.git

Fix the vagrant deployment

Add a fetch/ceph_cluster_uuid.conf file so we keep the same UUID from
the Vagrantfile and from the ceph-common run.
Prior to that change the Vagrantfile was setting
4a158d27-f750-41d5-9e7f-26ce4c9d2d45 but while playing the ceph-common
role we check if fetch/ceph_cluster_uuid.conf exists, if not we generate
an UUID. Here we ended up with 2 UUIDs...

IMPORTANT NOTE FOR NON-VAGRANT DEPLOYMENT. IF YOU WANT TO USE YOUR OWN
UUID PLEASE REMOVE THAT FILE BEFORE RUNNING THE PLAYBOOK.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---

diff --git a/.gitignore b/.gitignore
index 07573a658..f30a173eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .vagrant
 *.vdi
 *.keyring
-fetch/*
+fetch/4a158d27-f750-41d5-9e7f-26ce4c9d2d45/*
diff --git a/fetch/ceph_cluster_uuid.conf b/fetch/ceph_cluster_uuid.conf
new file mode 100644
index 000000000..5270957ba
--- /dev/null
+++ b/fetch/ceph_cluster_uuid.conf
@@ -0,0 +1 @@
+4a158d27-f750-41d5-9e7f-26ce4c9d2d45