Switch heat engine to oslo.i18n

Remove gettextutils from heat engine and import oslo.i18n.

blueprint oslo-i18n

Change-Id: Iadf4cfc0f9a0b94c1f2fa1eb71f807539247b34e

heat/engine/api.py

@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.common.i18n import _
 from heat.common import param_utils
 from heat.common import template_format
 from heat.engine import constraints as constr
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 from heat.openstack.common import timeutils
 from heat.rpc import api

heat/engine/clients/__init__.py

@@ -15,7 +15,7 @@ from oslo.config import cfg
 from stevedore import extension
 import warnings
 
-from heat.openstack.common.gettextutils import _
+from heat.common.i18n import _
 from heat.openstack.common import importutils
 from heat.openstack.common import log as logging
 

heat/engine/clients/os/glance.py

@@ -15,9 +15,9 @@ from glanceclient import client as gc
 from glanceclient import exc
 
 from heat.common import exception
+from heat.common.i18n import _
 from heat.engine.clients import client_plugin
 from heat.engine import constraints
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 from heat.openstack.common import uuidutils
 

heat/engine/dependencies.py

@@ -18,7 +18,7 @@ import six
 from six.moves import xrange
 
 from heat.common import exception
-from heat.openstack.common.gettextutils import _
+from heat.common.i18n import _
 
 
 class CircularDependencyException(exception.HeatException):

heat/engine/environment.py

@@ -20,7 +20,7 @@ import six
 
 from heat.common import environment_format as env_fmt
 from heat.common import exception
-from heat.openstack.common.gettextutils import _
+from heat.common.i18n import _
 from heat.openstack.common import log
 
 

heat/engine/event.py

@@ -14,9 +14,9 @@
 import six
 
 from heat.common import exception
+from heat.common.i18n import _
 from heat.common import identifier
 from heat.db import api as db_api
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/engine/hot/template.py

@@ -13,6 +13,7 @@
 import collections
 import six
 
+from heat.common.i18n import _
 from heat.engine.cfn import functions as cfn_funcs
 from heat.engine.cfn import template as cfn_template
 from heat.engine import function
@@ -20,7 +21,6 @@ from heat.engine.hot import functions as hot_funcs
 from heat.engine.hot import parameters
 from heat.engine import rsrc_defn
 from heat.engine import template
-from heat.openstack.common.gettextutils import _
 
 
 _RESOURCE_KEYS = (

heat/engine/parameter_groups.py

@@ -12,7 +12,7 @@
 #    under the License.
 
 from heat.common.exception import StackValidationFailed
-from heat.openstack.common.gettextutils import _
+from heat.common.i18n import _
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/engine/resource.py

@@ -19,6 +19,7 @@ import six
 import warnings
 
 from heat.common import exception
+from heat.common.i18n import _
 from heat.common import identifier
 from heat.common import short_id
 from heat.common import timeutils
@@ -33,7 +34,6 @@ from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.engine import support
 from heat.openstack.common import excutils
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 cfg.CONF.import_opt('action_retry_limit', 'heat.common.config')

heat/engine/scheduler.py

@@ -20,8 +20,8 @@ import types
 import eventlet
 import six
 
+from heat.common.i18n import _
 from heat.openstack.common import excutils
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/engine/service.py

@@ -26,6 +26,7 @@ import webob
 
 from heat.common import context
 from heat.common import exception
+from heat.common.i18n import _
 from heat.common import identifier
 from heat.common import messaging as rpc_messaging
 from heat.db import api as db_api
@@ -42,7 +43,6 @@ from heat.engine import resources
 from heat.engine import stack_lock
 from heat.engine import template as templatem
 from heat.engine import watchrule
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import jsonutils
 from heat.openstack.common import log as logging
 from heat.openstack.common import service

heat/engine/signal_responder.py

@@ -15,8 +15,8 @@ from keystoneclient.contrib.ec2 import utils as ec2_utils
 from oslo.config import cfg
 from six.moves.urllib import parse as urlparse
 
+from heat.common.i18n import _
 from heat.engine import stack_user
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 

heat/engine/stack.py

@@ -23,6 +23,7 @@ import six
 from heat.common import context as common_context
 from heat.common import exception
 from heat.common.exception import StackValidationFailed
+from heat.common.i18n import _
 from heat.common import identifier
 from heat.common import lifecycle_plugin_utils
 from heat.db import api as db_api
@@ -36,7 +37,6 @@ from heat.engine import resources
 from heat.engine import scheduler
 from heat.engine.template import Template
 from heat.engine import update
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 from heat.openstack.common import strutils
 from heat.rpc import api as rpc_api

heat/engine/stack_lock.py

@@ -18,10 +18,10 @@ from oslo.config import cfg
 from oslo import messaging
 
 from heat.common import exception
+from heat.common.i18n import _
 from heat.common import messaging as rpc_messaging
 from heat.db import api as db_api
 from heat.openstack.common import excutils
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')

heat/engine/stack_resource.py

@@ -15,13 +15,13 @@ from oslo.config import cfg
 
 from heat.common import environment_format
 from heat.common import exception
+from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import environment
 from heat.engine import parser
 from heat.engine import resource
 from heat.engine import scheduler
 from heat.engine import template
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/engine/stack_user.py

@@ -14,8 +14,8 @@
 import keystoneclient.exceptions as kc_exception
 
 from heat.common import exception
+from heat.common.i18n import _
 from heat.engine import resource
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 

heat/engine/update.py

@@ -13,11 +13,11 @@
 
 import six
 
+from heat.common.i18n import _
 from heat.db import api as db_api
 from heat.engine import dependencies
 from heat.engine import resource
 from heat.engine import scheduler
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/engine/watchrule.py

@@ -15,10 +15,10 @@
 import datetime
 
 from heat.common import exception
+from heat.common.i18n import _
 from heat.db import api as db_api
 from heat.engine import parser
 from heat.engine import timestamp
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 from heat.openstack.common import timeutils
 from heat.rpc import api as rpc_api