From 302389bf8d1d9dfeed9a7c07e8bb4b85fc731028 Mon Sep 17 00:00:00 2001
From: Vitaly Gridnev <vgridnev@mirantis.com>
Date: Thu, 12 Mar 2015 14:15:44 +0300
Subject: [PATCH] [SAHARA] Remove copying sahara.conf from base config file

Sahara is going to remove sahara.conf.sample because it
is not gated anymore and therefore it gets out of date.
So, we need to remove copying sahara.conf from base config file
sahara.conf.sample

Change-Id: I0ddf36cfc15694dfe41fe695d577199da75ce7f1
---
 lib/sahara | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/sahara b/lib/sahara
index 521b19a4a1..709e90e1bd 100644
--- a/lib/sahara
+++ b/lib/sahara
@@ -111,9 +111,6 @@ function configure_sahara {
         cp -p $SAHARA_DIR/etc/sahara/policy.json $SAHARA_CONF_DIR
     fi
 
-    # Copy over sahara configuration file and configure common parameters.
-    cp $SAHARA_DIR/etc/sahara/sahara.conf.sample $SAHARA_CONF_FILE
-
     # Create auth cache dir
     sudo mkdir -p $SAHARA_AUTH_CACHE_DIR
     sudo chown $STACK_USER $SAHARA_AUTH_CACHE_DIR