Merge "Ignore errors in OS::stack_id output"
This commit is contained in:
commit
8818adb0f5
|
@ -11,6 +11,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 oslo_log import log as logging
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from requests import exceptions
|
from requests import exceptions
|
||||||
import six
|
import six
|
||||||
|
@ -27,6 +28,8 @@ from heat.engine.resources import stack_resource
|
||||||
from heat.engine import template
|
from heat.engine import template
|
||||||
from heat.rpc import api as rpc_api
|
from heat.rpc import api as rpc_api
|
||||||
|
|
||||||
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
REMOTE_SCHEMES = ('http', 'https')
|
REMOTE_SCHEMES = ('http', 'https')
|
||||||
LOCAL_SCHEMES = ('file',)
|
LOCAL_SCHEMES = ('file',)
|
||||||
|
@ -316,6 +319,8 @@ class TemplateResource(stack_resource.StackResource):
|
||||||
resource=self.name,
|
resource=self.name,
|
||||||
attribute=STACK_ID_OUTPUT,
|
attribute=STACK_ID_OUTPUT,
|
||||||
message=output[rpc_api.OUTPUT_ERROR])
|
message=output[rpc_api.OUTPUT_ERROR])
|
||||||
|
except exception.TemplateOutputError as err:
|
||||||
|
LOG.info('%s', err)
|
||||||
except (exception.InvalidTemplateAttribute, exception.NotFound):
|
except (exception.InvalidTemplateAttribute, exception.NotFound):
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue