From 7b419b5621ea1b12f8c28d387f1a15217256cf70 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <zhaoxinyu@huawei.com>
Date: Fri, 17 Apr 2015 11:34:53 +0800
Subject: [PATCH] install setuptools twice to ensure latest version

Change-Id: I52302733f96197cd4666cb1131cdbd3a2e3900f2
---
 install/roles/compass/tasks/RedHat.yml             | 5 +++++
 install/roles/compass/templates/compass.setting.j2 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/install/roles/compass/tasks/RedHat.yml b/install/roles/compass/tasks/RedHat.yml
index 0b56fe2..3fb1bc7 100644
--- a/install/roles/compass/tasks/RedHat.yml
+++ b/install/roles/compass/tasks/RedHat.yml
@@ -96,6 +96,11 @@
        extra_args='-i http://pypi.douban.com/simple/'
        state=latest
 
+- name: pip install latest setuptools2
+  pip: name=setuptools
+       extra_args='-i http://pypi.douban.com/simple/'
+       state=latest
+
 - name: pip install ansible
   pip: name=ansible
        extra_args='-i http://pypi.douban.com/simple/'
diff --git a/install/roles/compass/templates/compass.setting.j2 b/install/roles/compass/templates/compass.setting.j2
index b2b97eb..a8d79c6 100644
--- a/install/roles/compass/templates/compass.setting.j2
+++ b/install/roles/compass/templates/compass.setting.j2
@@ -10,7 +10,7 @@ INSTALLATION_LOGDIR = {
     'CobblerInstaller': '/var/log/cobbler/anamon',
     'ChefInstaller': '/var/log/chef'
 }
-DEFAULT_LOGLEVEL = 'info'
+DEFAULT_LOGLEVEL = 'debug'
 DEFAULT_LOGDIR = '/var/log/compass'
 DEFAULT_LOGINTERVAL = 6
 DEFAULT_LOGINTERVAL_UNIT = 'h'