diff options
| -rw-r--r-- | api/escalator/cmd/__init__.py | 5 | ||||
| -rw-r--r-- | api/etc/escalator-api.conf | 1 | ||||
| -rw-r--r-- | client/doc/source/conf.py | 2 | ||||
| -rw-r--r-- | client/doc/source/man/escalator.rst | 2 | ||||
| -rw-r--r-- | client/escalatorclient/__init__.py | 2 | ||||
| -rw-r--r-- | client/escalatorclient/common/http.py | 2 | ||||
| -rw-r--r-- | client/run_tests.sh | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 |
8 files changed, 10 insertions, 8 deletions
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/client/doc/source/conf.py b/client/doc/source/conf.py index 1cfaad2..0e00ed1 100644 --- a/client/doc/source/conf.py +++ b/client/doc/source/conf.py @@ -28,7 +28,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = 'python-escalatorclient' +project = 'escalatorclient' copyright = u'OpenStack Foundation' # If true, '()' will be appended to :func: etc. cross-reference text. diff --git a/client/doc/source/man/escalator.rst b/client/doc/source/man/escalator.rst index 40536ec..bb90ac1 100644 --- a/client/doc/source/man/escalator.rst +++ b/client/doc/source/man/escalator.rst @@ -84,4 +84,4 @@ BUGS ==== escalator client is hosted in Launchpad so you can view current bugs at -https://bugs.launchpad.net/python-escalatorclient/. +https://bugs.launchpad.net/escalatorclient/. diff --git a/client/escalatorclient/__init__.py b/client/escalatorclient/__init__.py index 4b95f8a..8d43a42 100644 --- a/client/escalatorclient/__init__.py +++ b/client/escalatorclient/__init__.py @@ -23,7 +23,7 @@ except ImportError: import pbr.version -version_info = pbr.version.VersionInfo('python-escalatorclient') +version_info = pbr.version.VersionInfo('escalatorclient') try: __version__ = version_info.version_string() diff --git a/client/escalatorclient/common/http.py b/client/escalatorclient/common/http.py index 301eedb..36a2157 100644 --- a/client/escalatorclient/common/http.py +++ b/client/escalatorclient/common/http.py @@ -45,7 +45,7 @@ if not hasattr(parse, 'parse_qsl'): osprofiler_web = importutils.try_import("osprofiler.web") LOG = logging.getLogger(__name__) -USER_AGENT = 'python-escalatorclient' +USER_AGENT = 'escalatorclient' CHUNKSIZE = 1024 * 64 # 64kB diff --git a/client/run_tests.sh b/client/run_tests.sh index 80edda6..ff7d278 100644 --- a/client/run_tests.sh +++ b/client/run_tests.sh @@ -2,7 +2,7 @@ function usage { echo "Usage: $0 [OPTION]..." - echo "Run python-escalatorclient's test suite(s)" + echo "Run escalatorclient's test suite(s)" echo "" echo " -p, --pep8 Just run flake8" echo " -h, --help Print this usage message" 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 \
|