summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-09 17:51:43 +0000
committerGerrit Code Review <review@openstack.org>2018-07-09 17:51:43 +0000
commit6838a212e69e1de7df5b08d13890bef50a6eede8 (patch)
tree5926d4848217b0ec346120bb8ab8a99a8845ae35
parent4b4effa9c8062c26fafe2b9c20146bf67b44b2b5 (diff)
parentde5a4cf4a4070a987bb5813446ee26be98be073a (diff)
Merge "Deprecate sahara-all"
-rw-r--r--releasenotes/notes/deprecate-sahara-all-entry-point-1446a00dab643b7b.yaml4
-rw-r--r--sahara/cli/sahara_all.py13
2 files changed, 17 insertions, 0 deletions
diff --git a/releasenotes/notes/deprecate-sahara-all-entry-point-1446a00dab643b7b.yaml b/releasenotes/notes/deprecate-sahara-all-entry-point-1446a00dab643b7b.yaml
new file mode 100644
index 0000000..484e7a7
--- /dev/null
+++ b/releasenotes/notes/deprecate-sahara-all-entry-point-1446a00dab643b7b.yaml
@@ -0,0 +1,4 @@
1---
2deprecations:
3 - The `sahara-all` entry point is now deprecated. Please use the sahara-api
4 and sahara-engine entry points instead.
diff --git a/sahara/cli/sahara_all.py b/sahara/cli/sahara_all.py
index 1408c83..e262c8d 100644
--- a/sahara/cli/sahara_all.py
+++ b/sahara/cli/sahara_all.py
@@ -20,7 +20,9 @@ import os
20import sys 20import sys
21 21
22import oslo_i18n 22import oslo_i18n
23from oslo_log import log
23 24
25LOG = log.getLogger(__name__)
24 26
25# If ../sahara/__init__.py exists, add ../ to Python search path, so that 27# If ../sahara/__init__.py exists, add ../ to Python search path, so that
26# it will override what happens to be installed in /usr/(local/)lib/python... 28# it will override what happens to be installed in /usr/(local/)lib/python...
@@ -52,5 +54,16 @@ def main():
52 server.setup_auth_policy() 54 server.setup_auth_policy()
53 55
54 launcher = server.get_process_launcher() 56 launcher = server.get_process_launcher()
57 LOG.warning("""
58 __ __ _
59 \ \ / /_ _ _ __ _ __ (_)_ __ __ _
60 \ \ /\ / / _` | '__| '_ \| | '_ \ / _` |
61 \ V V / (_| | | | | | | | | | | (_| |
62 \_/\_/ \__,_|_| |_| |_|_|_| |_|\__, |
63 |___/
64
65Using the sahara-all entry point is now deprecated. Please use the sahara-api
66and sahara-engine entry points instead.
67 """)
55 server.launch_api_service( 68 server.launch_api_service(
56 launcher, server.SaharaWSGIService("sahara-all", app)) 69 launcher, server.SaharaWSGIService("sahara-all", app))