From: kong wei <kong.wei2@zte.com.cn>
Date: Mon, 6 Mar 2017 01:27:54 +0000 (+0000)
Subject: Merge "There is warning message: Option "verbose" from group "DEFAULT" is deprecated... 
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=escalator.git;a=commitdiff_plain;h=639460b74df6e282b46e6e391d3f62fe13a78499;hp=67f7f9461efb4d37b266b0f7c5335ed3324be651

Merge "There is warning message: Option "verbose" from group "DEFAULT" is deprecated for removal.  Its value may be silently ignored in the future. So it should be removed from config file."
---

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/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 \