]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Do not track fetch directory 330/head
authorleseb <seb@redhat.com>
Fri, 17 Jul 2015 16:08:24 +0000 (18:08 +0200)
committerleseb <seb@redhat.com>
Fri, 17 Jul 2015 16:14:12 +0000 (18:14 +0200)
Signed-off-by: leseb <seb@redhat.com>
.gitignore
fetch/.empty [deleted file]
fetch/ceph_cluster_uuid.conf [deleted file]
roles/ceph-common/tasks/main.yml
roles/ceph-mon/tasks/deploy_monitors.yml

index a422e1ed2eb55b5d8e29198efc77ece202a982f3..360a98dd3f03ef1a2d99531bae7c79f01339a07e 100644 (file)
@@ -1,7 +1,7 @@
 .vagrant
 *.vdi
 *.keyring
-fetch/4a158d27-f750-41d5-9e7f-26ce4c9d2d45/*
+fetch/*
 vagrant_variables.yml
 group_vars/all
 group_vars/mons
diff --git a/fetch/.empty b/fetch/.empty
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/fetch/ceph_cluster_uuid.conf b/fetch/ceph_cluster_uuid.conf
deleted file mode 100644 (file)
index 5270957..0000000
+++ /dev/null
@@ -1 +0,0 @@
-4a158d27-f750-41d5-9e7f-26ce4c9d2d45
index d8fb3450783497a256bde266f9854076879ebf4a..cefe1e50f57e0d4726ff7e97e20e91df99c42746 100644 (file)
@@ -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: >
index 55cbd0eda5ef5cd9d6f867142ad0f3def39b3599..d0fbd40b99c7d757a4afd5a937dcc70498cb845b 100644 (file)
@@ -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: >