Merge "Add deprecation warning when using map-services"

This commit is contained in:
Jenkins 2014-11-22 14:48:33 +00:00 committed by Gerrit Code Review
commit 019196ef7f
4 changed files with 12 additions and 2 deletions

View File

@ -5,3 +5,4 @@ set -o pipefail
# For Debian map-services is currently a noop # For Debian map-services is currently a noop
# We pass through the service name directly # We pass through the service name directly
echo "$@" echo "$@"
>&2 echo "WARNING: map-services has been deprecated. Please use svc-map."

View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# dib-lint: disable=indent
# Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2012 Hewlett-Packard Development Company, L.P.
# Copyright 2014 SUSE, Inc. # Copyright 2014 SUSE, Inc.
# #
@ -15,6 +15,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from __future__ import print_function
import os import os
import sys import sys
@ -50,6 +51,9 @@ service_map = {
'nova-scheduler': 'openstack-nova-scheduler', 'nova-scheduler': 'openstack-nova-scheduler',
} }
print("WARNING: map-services has been deprecated. "
"Please use the svc-map element.", file=sys.stderr)
for arg in sys.argv[1:]: for arg in sys.argv[1:]:
# We need to support the service name being different when installing from # We need to support the service name being different when installing from
# source vs. packages. So, if the requested service file already exists, # source vs. packages. So, if the requested service file already exists,

View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# dib-lint: disable=indent
# Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2012 Hewlett-Packard Development Company, L.P.
# Copyright 2014 Red Hat, Inc. # Copyright 2014 Red Hat, Inc.
# #
@ -15,6 +15,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from __future__ import print_function
import os import os
import sys import sys
@ -67,6 +68,9 @@ service_map = {
'tgt': 'tgtd', 'tgt': 'tgtd',
} }
print("WARNING: map-services has been deprecated. "
"Please use the svc-map element.", file=sys.stderr)
for arg in sys.argv[1:]: for arg in sys.argv[1:]:
# We need to support the service name being different when installing from # We need to support the service name being different when installing from
# source vs. packages. So, if the requested service file already exists, # source vs. packages. So, if the requested service file already exists,

View File

@ -5,3 +5,4 @@ set -o pipefail
# For Ubuntu map-services is currently a noop # For Ubuntu map-services is currently a noop
# We pass through the service name directly # We pass through the service name directly
echo "$@" echo "$@"
>&2 echo "WARNING: map-services has been deprecated. Please use svc-map."