Merge "Remove warnings in heat"

5 files changed, 44 insertions, 19 deletions

diff --git a/bin/heat-api b/bin/heat-api
index f08228f13..85dafb2bf 100755
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -18,10 +18,15 @@
 An OpenStack REST API to Heat.
 """
 
-import warnings
-warnings.warn("DEPRECATED: This script is deprecated. Please use the "
-              "system level heat binaries installed to start "
-              "any of the heat services.", DeprecationWarning)
+from oslo_log import log as logging
+
+from heat.common.i18n import _LW
+
+LOG = logging.getLogger(__name__)
+
+LOG.warning(_LW('DEPRECATED: `heat-api` script is deprecated. Please use the '
+                'system level heat binaries installed to start '
+                'any of the heat services.'))
 
 import os
 import sys
diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn
index 8e6571c68..810f1184d 100755
--- a/bin/heat-api-cfn
+++ b/bin/heat-api-cfn
@@ -20,10 +20,15 @@ translates it into a native representation.  It then calls the heat-engine via
 AMQP RPC to implement them.
 """
 
-import warnings
-warnings.warn("DEPRECATED: This script is deprecated. Please use the "
-              "system level heat binaries installed to start "
-              "any of the heat services.", DeprecationWarning)
+from oslo_log import log as logging
+
+from heat.common.i18n import _LW
+
+LOG = logging.getLogger(__name__)
+
+LOG.warning(_LW('DEPRECATED: `heat-api-cfn` script is deprecated. Please use '
+                'the system level heat binaries installed to start '
+                'any of the heat services.'))
 
 import os
 import sys
diff --git a/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch
index 2cd5dcaf0..01c55ee04 100755
--- a/bin/heat-api-cloudwatch
+++ b/bin/heat-api-cloudwatch
@@ -20,10 +20,15 @@ into a native representation. It then calls the heat-engine via AMQP RPC to
 implement them.
 """
 
-import warnings
-warnings.warn("DEPRECATED: This script is deprecated. Please use the "
-              "system level heat binaries installed to start "
-              "any of the heat services.", DeprecationWarning)
+from oslo_log import log as logging
+
+from heat.common.i18n import _LW
+
+LOG = logging.getLogger(__name__)
+
+LOG.warning(_LW('DEPRECATED: `heat-api-cloudwatch` script is deprecated. '
+                'Please use the system level heat binaries installed to '
+                'start any of the heat services.'))
 
 import os
 import sys
diff --git a/bin/heat-engine b/bin/heat-engine
index 9f1c577c8..f4d9cb0bc 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -20,10 +20,15 @@ Normal communications is done via the heat API which then calls into this
 engine.
 """
 
-import warnings
-warnings.warn("DEPRECATED: This script is deprecated. Please use the "
-              "system level heat binaries installed to start "
-              "any of the heat services.", DeprecationWarning)
+from oslo_log import log as logging
+
+from heat.common.i18n import _LW
+
+LOG = logging.getLogger(__name__)
+
+LOG.warning(_LW('DEPRECATED: `heat-engine` script is deprecated. '
+                'Please use the system level heat binaries installed to '
+                'start any of the heat services.'))
 
 import os
 import sys
diff --git a/bin/heat-manage b/bin/heat-manage
index 3a7f42f57..ccf970d97 100755
--- a/bin/heat-manage
+++ b/bin/heat-manage
@@ -13,9 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import warnings
-warnings.warn("DEPRECATED: This script is deprecated. Please use the "
-              "system level heat-manage binary", DeprecationWarning)
+from oslo_log import log as logging
+
+from heat.common.i18n import _LW
+
+LOG = logging.getLogger(__name__)
+
+LOG.warning(_LW('DEPRECATED: `heat-manage` script is deprecated. Please use '
+                'the system level heat-manage binary.'))
 
 import os
 import sys