From 4ed57d8d5a4e85da30f04cfe20f824de361b0a79 Mon Sep 17 00:00:00 2001 From: dixiaoli Date: Tue, 22 Mar 2016 10:35:42 +0800 Subject: [PATCH] Remove property "ssh_authorized_key" from OS::Magnum::BayModel This change marks the ssh_authorized_key property as HIDDEN from resource OS::Magnum::BayModel due to magnum has removed it in this patch: https://review.openstack.org/#/c/274452/ Co-Authored-By: Hongbin Lu Change-Id: I573918c77cf35fe98c6c0fb3eed7f70df39e03d0 Closes-Bug: #1560284 --- heat/engine/resources/openstack/magnum/baymodel.py | 7 ++++++- heat/tests/openstack/magnum/test_baymodel.py | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/heat/engine/resources/openstack/magnum/baymodel.py b/heat/engine/resources/openstack/magnum/baymodel.py index c5d92ff42b..61bb3c8b22 100644 --- a/heat/engine/resources/openstack/magnum/baymodel.py +++ b/heat/engine/resources/openstack/magnum/baymodel.py @@ -110,6 +110,12 @@ class BayModel(resource.Resource): SSH_AUTHORIZED_KEY: properties.Schema( properties.Schema.STRING, _('The SSH Authorized Key.'), + support_status=support.SupportStatus( + status=support.HIDDEN, + version='6.0.0', + message=_('This attribute has been removed in Magnum'), + previous_status=support.SupportStatus(version='5.0.0') + ) ), COE: properties.Schema( properties.Schema.STRING, @@ -183,7 +189,6 @@ class BayModel(resource.Resource): 'fixed_network': self.properties[self.FIXED_NETWORK], 'dns_nameserver': self.properties[self.DNS_NAMESERVER], 'docker_volume_size': self.properties[self.DOCKER_VOLUME_SIZE], - 'ssh_authorized_key': self.properties[self.SSH_AUTHORIZED_KEY], 'coe': self.properties[self.COE], } if self.properties[self.NETWORK_DRIVER]: diff --git a/heat/tests/openstack/magnum/test_baymodel.py b/heat/tests/openstack/magnum/test_baymodel.py index 992a021178..82e94f030a 100644 --- a/heat/tests/openstack/magnum/test_baymodel.py +++ b/heat/tests/openstack/magnum/test_baymodel.py @@ -40,7 +40,6 @@ class TestMagnumBayModel(common.HeatTestCase): fixed_network: 0f59a3dd-fac1-4d03-b41a-d4115fbffa89 dns_nameserver: 8.8.8.8 docker_volume_size: 5 - ssh_authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB coe: 'swarm' ''' @@ -54,7 +53,6 @@ class TestMagnumBayModel(common.HeatTestCase): 'fixed_network': '0f59a3dd-fac1-4d03-b41a-d4115fbffa89', 'dns_nameserver': '8.8.8.8', 'docker_volume_size': 5, - 'ssh_authorized_key': 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB', 'coe': 'swarm', } @@ -107,7 +105,6 @@ class TestMagnumBayModelWithAddedProperties(TestMagnumBayModel): fixed_network: 0f59a3dd-fac1-4d03-b41a-d4115fbffa89 dns_nameserver: 8.8.8.8 docker_volume_size: 5 - ssh_authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB coe: 'mesos' network_driver: 'flannel' http_proxy: 'http://proxy.com:123' @@ -128,7 +125,6 @@ class TestMagnumBayModelWithAddedProperties(TestMagnumBayModel): 'fixed_network': '0f59a3dd-fac1-4d03-b41a-d4115fbffa89', 'dns_nameserver': '8.8.8.8', 'docker_volume_size': 5, - 'ssh_authorized_key': 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB', 'coe': 'mesos', 'network_driver': 'flannel', 'http_proxy': 'http://proxy.com:123',