From 759b35b6beb1779881007d0b1b6d94edea02e398 Mon Sep 17 00:00:00 2001 From: "Mclean, Aaron (am9518)" Date: Thu, 6 Sep 2018 22:51:32 -0500 Subject: [PATCH] [US449915] NC 1.0 - Fixing IMS Heat Template for Ocata Change-Id: If5ddcb57dc5c98011f63a7c316c9b7f5b9289150 --- .../resource_distributor/rds/services/yaml_image_builder.py | 2 +- orm/tests/unit/rds/services/test_image_yaml.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/orm/services/resource_distributor/rds/services/yaml_image_builder.py b/orm/services/resource_distributor/rds/services/yaml_image_builder.py index 4888252c..6bfe48eb 100755 --- a/orm/services/resource_distributor/rds/services/yaml_image_builder.py +++ b/orm/services/resource_distributor/rds/services/yaml_image_builder.py @@ -42,7 +42,7 @@ def _properties(alldata, region): def _glanceimage(alldata, region): return dict( - type="OS::Glance::Image2", + type="OS::Glance::Image", properties=_properties(alldata, region) ) diff --git a/orm/tests/unit/rds/services/test_image_yaml.py b/orm/tests/unit/rds/services/test_image_yaml.py index 951eefcf..08959ea3 100755 --- a/orm/tests/unit/rds/services/test_image_yaml.py +++ b/orm/tests/unit/rds/services/test_image_yaml.py @@ -55,7 +55,7 @@ yaml_output = { 'image_internal_id': 1 } }, - 'type': 'OS::Glance::Image2' + 'type': 'OS::Glance::Image' } }, 'heat_template_version': '2015-1-1',