Merge pull request #330 from ceph/vagrant-clean

Do not track fetch directory

.gitignore

@@ -1,7 +1,7 @@
 .vagrant
 *.vdi
 *.keyring
-fetch/4a158d27-f750-41d5-9e7f-26ce4c9d2d45/*
+fetch/*
 vagrant_variables.yml
 group_vars/all
 group_vars/mons

fetch/ceph_cluster_uuid.conf

@@ -1 +0,0 @@
-4a158d27-f750-41d5-9e7f-26ce4c9d2d45

roles/ceph-common/tasks/main.yml

@@ -42,6 +42,7 @@
     creates=fetch/ceph_cluster_uuid.conf
   register: cluster_uuid
   sudo: false
+  when: fsid != '4a158d27-f750-41d5-9e7f-26ce4c9d2d45'
 
 - name: read cluster UUID if it already exists
   local_action: command cat fetch/ceph_cluster_uuid.conf
@@ -49,6 +50,7 @@
   changed_when: false
   register: cluster_uuid
   sudo: false
+  when: fsid != '4a158d27-f750-41d5-9e7f-26ce4c9d2d45'
 
 - name: generate Ceph configuration file
   template: >

roles/ceph-mon/tasks/deploy_monitors.yml

@@ -5,6 +5,7 @@
     creates=fetch/monitor_keyring.conf
   register: monitor_keyring
   sudo: false
+  when: monitor_secret != 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw=='
 
 - name: read monitor initial keyring if it already exists
   local_action: >
@@ -13,6 +14,7 @@
   changed_when: false
   register: monitor_keyring
   sudo: false
+  when: monitor_secret != 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw=='
 
 - name: create monitor initial keyring
   command: >