From 21cd46bf8ada7761d79033d85933354173625c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Wed, 27 Jan 2016 23:58:51 +0100
Subject: [PATCH] remove unecessary variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

these variables will be created on the fly, there is no need to force
them.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 Vagrantfile                              | 2 --
 roles/ceph-common/tasks/main.yml         | 2 --
 roles/ceph-mon/tasks/deploy_monitors.yml | 2 --
 3 files changed, 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 9f7475447..11b7f1010 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -36,8 +36,6 @@ ansible_provision = proc do |ansible|
   ansible.extra_vars = {
     ceph_stable: 'true',
     journal_collocation: 'true',
-    fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
-    monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
     journal_size: 100,
     monitor_interface: ETH,
     cluster_network: "#{SUBNET}.0/24",
diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 87de1a403..3764a95f1 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -68,7 +68,6 @@
     creates="{{ fetch_directory }}/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_directory }}/ceph_cluster_uuid.conf
@@ -76,7 +75,6 @@
   changed_when: false
   register: cluster_uuid
   sudo: false
-  when: fsid != '4a158d27-f750-41d5-9e7f-26ce4c9d2d45'
 
 - name: create ceph conf directory
   file:
diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml
index d898c9fc1..9df981a74 100644
--- a/roles/ceph-mon/tasks/deploy_monitors.yml
+++ b/roles/ceph-mon/tasks/deploy_monitors.yml
@@ -4,7 +4,6 @@
     creates={{ fetch_directory }}/monitor_keyring.conf
   register: monitor_keyring
   sudo: false
-  when: monitor_secret != 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw=='
 
 - name: read monitor initial keyring if it already exists
   local_action: command cat {{ fetch_directory }}/monitor_keyring.conf
@@ -12,7 +11,6 @@
   changed_when: false
   register: monitor_keyring
   sudo: false
-  when: monitor_secret != 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw=='
 
 - name: create monitor initial keyring
   command: ceph-authtool /var/lib/ceph/tmp/keyring.mon.{{ ansible_hostname }} --create-keyring --name=mon. --add-key={{ monitor_secret }} --cap mon 'allow *'