From 51ebda6c8d37539473e463e8b24f27f21d798392 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <slukjanov@mirantis.com>
Date: Wed, 12 Mar 2014 22:26:12 +0400
Subject: [PATCH] Use sahara.conf.sample instead of old one

Sahara internals was updated, now we can use correct conf sample.

Change-Id: Ia8d99c2742785c3b5c724617a5dfc2880624a03f
---
 lib/sahara | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/sahara b/lib/sahara
index 4cb04ecd3a..38b4ecd7e9 100644
--- a/lib/sahara
+++ b/lib/sahara
@@ -106,8 +106,7 @@ function configure_sahara {
     sudo chown $STACK_USER $SAHARA_CONF_DIR
 
     # Copy over sahara configuration file and configure common parameters.
-    # TODO(slukjanov): rename when sahara internals will be updated
-    cp $SAHARA_DIR/etc/savanna/savanna.conf.sample $SAHARA_CONF_FILE
+    cp $SAHARA_DIR/etc/sahara/sahara.conf.sample $SAHARA_CONF_FILE
 
     # Create auth cache dir
     sudo mkdir -p $SAHARA_AUTH_CACHE_DIR