Merge "The code using 'python-escalatorclient' as the client's package name. But...

diff --git a/api/escalator/cmd/__init__.py b/api/escalator/cmd/__init__.py
index 871224d..2e1b10b 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,7 @@
 FROM centos:7\r
 LABEL escalator_image_version=1.0\r
+ARG BRANCH\r
+ENV BRANCH=${BRANCH:-master}\r
 RUN yum -y update\r
 RUN yum -y install centos-release-openstack-newton\r
 RUN yum -y install \\r