From: kong wei <kong.wei2@zte.com.cn>
Date: Mon, 6 Mar 2017 01:28:31 +0000 (+0000)
Subject: Merge "The code using 'python-escalatorclient' as the client's package name. But... 
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=escalator.git;a=commitdiff_plain;h=3756b89c9bdd1274b1784750253485416920d8b6;hp=4d83093923afb9feb3372d993f1743a715bf7640

Merge "The code using 'python-escalatorclient' as the client's package name. But the true name is 'escalatorclient'. Now, when the shell command 'escalator' was run, the system said: Exception: Versioning for this project requires either an sdist tarball, or access to an upstream git repository. It's also possible that there is a mismatch between the package name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name python-escalatorclient was given, but was not able to be found."
---

diff --git a/api/escalator/cmd/__init__.py b/api/escalator/cmd/__init__.py
index 871224d..2e1b10b 100644
--- a/api/escalator/cmd/__init__.py
+++ b/api/escalator/cmd/__init__.py
@@ -12,5 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from escalator import i18n
-i18n.enable_lazy()
+import oslo_i18n
+
+oslo_i18n.enable_lazy()
diff --git a/api/etc/escalator-api.conf b/api/etc/escalator-api.conf
index 5287777..c26db34 100644
--- a/api/etc/escalator-api.conf
+++ b/api/etc/escalator-api.conf
@@ -1,7 +1,6 @@
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
 #verbose = False
-verbose = True
 
 # Show debugging output in logs (sets DEBUG log level output)
 #debug = False
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 48e254f..fa78819 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,7 @@
 FROM centos:7
 LABEL escalator_image_version=1.0
+ARG BRANCH
+ENV BRANCH=${BRANCH:-master}
 RUN yum -y update
 RUN yum -y install centos-release-openstack-newton
 RUN yum -y install \