From 840ef721acf0b3dfce14230e7f221fe91ae777e4 Mon Sep 17 00:00:00 2001
From: Angus Salkeld <asalkeld@mirantis.com>
Date: Fri, 12 Sep 2014 13:47:05 +1000
Subject: [PATCH] Make sure the name in setup.cfg is murano-agent not
 muranoagent

This also reverts the following oslo-incubator commit
https://github.com/openstack/oslo-incubator/commit/f6a1848688483c34be2fb5ba2544f80bc659a26c

Change-Id: I467699eb70c5332d097b072e6696cb21f6c6de63
Closes-bug: #1367543
---
 setup.cfg                       | 2 +-
 tools/config/generate_sample.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 31112cae..ba9732a8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-name = muranoagent
+name = murano-agent
 summary = Python Murano Agent
 description-file =
     README.rst
diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh
index d88e9d1e..cabd02d7 100755
--- a/tools/config/generate_sample.sh
+++ b/tools/config/generate_sample.sh
@@ -75,7 +75,9 @@ then
     BASEDIR=$(cd "$BASEDIR" && pwd)
 fi
 
-PACKAGENAME=${PACKAGENAME:-$(python setup.py --name)}
+# Note: This change below is until the following bug is fixed:
+# https://bugs.launchpad.net/oslo-incubator/+bug/1367990
+PACKAGENAME=${PACKAGENAME:-${BASEDIR##*/}}
 TARGETDIR=$BASEDIR/$PACKAGENAME
 if ! [ -d $TARGETDIR ]
 then