From: leseb Date: Fri, 17 Jul 2015 16:08:24 +0000 (+0200) Subject: Do not track fetch directory X-Git-Tag: v1.0.0~166^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5fc4d846a6d7958ac5722d774f0bd47a61cba255;p=ceph-ansible.git Do not track fetch directory Signed-off-by: leseb --- diff --git a/.gitignore b/.gitignore index a422e1ed2..360a98dd3 100644 --- a/.gitignore +++ b/.gitignore @@ -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 index e69de29bb..000000000 diff --git a/fetch/ceph_cluster_uuid.conf b/fetch/ceph_cluster_uuid.conf deleted file mode 100644 index 5270957ba..000000000 --- a/fetch/ceph_cluster_uuid.conf +++ /dev/null @@ -1 +0,0 @@ -4a158d27-f750-41d5-9e7f-26ce4c9d2d45 diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index d8fb34507..cefe1e50f 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/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: > diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml index 55cbd0eda..d0fbd40b9 100644 --- a/roles/ceph-mon/tasks/deploy_monitors.yml +++ b/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: >