openstack/heat
Code Issues Proposed changes

Merge "Change Docker resource mapping name"

Browse Source
This commit is contained in:
Jenkins 2014-02-24 20:14:41 +00:00 committed by Gerrit Code Review
commit ac40fa9e6e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/docker/resources/docker_container.py
View File

@ -273,7 +273,7 @@ class DockerContainer(resource.Resource):
def resource_mapping(): def resource_mapping():
return { return {
'OS::Docker::Container': DockerContainer, 'DockerInc::Docker::Container': DockerContainer,
} }

6
contrib/docker/tests/test_docker_container.py
View File

@ -33,7 +33,7 @@ template = '''
"Parameters": {}, "Parameters": {},
"Resources": { "Resources": {
"Blog": { "Blog": {
"Type": "OS::Docker::Container", "Type": "DockerInc::Docker::Container",
"Properties": { "Properties": {
"image": "samalba/wordpress", "image": "samalba/wordpress",
"env": [ "env": [
@ -51,8 +51,8 @@ class DockerContainerTest(HeatTestCase):
def setUp(self): def setUp(self):
super(DockerContainerTest, self).setUp() super(DockerContainerTest, self).setUp()
utils.setup_dummy_db() utils.setup_dummy_db()
resource._register_class('OS::Docker::Container', for res_name, res_class in docker_container.resource_mapping().items():
docker_container.DockerContainer) resource._register_class(res_name, res_class)
def create_container(self, resource_name): def create_container(self, resource_name):
t = template_format.parse(template) t = template_format.parse(template)