openstack
/
heat
Code Issues Proposed changes

Merge "Remove property "ssh_authorized_key" from OS::Magnum::BayModel"

This commit is contained in:
Jenkins 2016-03-25 12:57:06 +00:00 committed by Gerrit Code Review
parent 5dcb7eae7a 4ed57d8d5a
commit e597e17175
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/resources/openstack/magnum/baymodel.py
View File

@ -110,6 +110,12 @@ class BayModel(resource.Resource):
SSH_AUTHORIZED_KEY: properties.Schema( SSH_AUTHORIZED_KEY: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The SSH Authorized Key.'), _('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( COE: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
@ -183,7 +189,6 @@ class BayModel(resource.Resource):
'fixed_network': self.properties[self.FIXED_NETWORK], 'fixed_network': self.properties[self.FIXED_NETWORK],
'dns_nameserver': self.properties[self.DNS_NAMESERVER], 'dns_nameserver': self.properties[self.DNS_NAMESERVER],
'docker_volume_size': self.properties[self.DOCKER_VOLUME_SIZE], 'docker_volume_size': self.properties[self.DOCKER_VOLUME_SIZE],
'ssh_authorized_key': self.properties[self.SSH_AUTHORIZED_KEY],
'coe': self.properties[self.COE], 'coe': self.properties[self.COE],
} }
if self.properties[self.NETWORK_DRIVER]: if self.properties[self.NETWORK_DRIVER]:

4
heat/tests/openstack/magnum/test_baymodel.py
View File

@ -40,7 +40,6 @@ class TestMagnumBayModel(common.HeatTestCase):
fixed_network: 0f59a3dd-fac1-4d03-b41a-d4115fbffa89 fixed_network: 0f59a3dd-fac1-4d03-b41a-d4115fbffa89
dns_nameserver: 8.8.8.8 dns_nameserver: 8.8.8.8
docker_volume_size: 5 docker_volume_size: 5
ssh_authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB
coe: 'swarm' coe: 'swarm'
''' '''
@ -54,7 +53,6 @@ class TestMagnumBayModel(common.HeatTestCase):
'fixed_network': '0f59a3dd-fac1-4d03-b41a-d4115fbffa89', 'fixed_network': '0f59a3dd-fac1-4d03-b41a-d4115fbffa89',
'dns_nameserver': '8.8.8.8', 'dns_nameserver': '8.8.8.8',
'docker_volume_size': 5, 'docker_volume_size': 5,
'ssh_authorized_key': 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB',
'coe': 'swarm', 'coe': 'swarm',
} }
@ -107,7 +105,6 @@ class TestMagnumBayModelWithAddedProperties(TestMagnumBayModel):
fixed_network: 0f59a3dd-fac1-4d03-b41a-d4115fbffa89 fixed_network: 0f59a3dd-fac1-4d03-b41a-d4115fbffa89
dns_nameserver: 8.8.8.8 dns_nameserver: 8.8.8.8
docker_volume_size: 5 docker_volume_size: 5
ssh_authorized_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB
coe: 'mesos' coe: 'mesos'
network_driver: 'flannel' network_driver: 'flannel'
http_proxy: 'http://proxy.com:123' http_proxy: 'http://proxy.com:123'
@ -128,7 +125,6 @@ class TestMagnumBayModelWithAddedProperties(TestMagnumBayModel):
'fixed_network': '0f59a3dd-fac1-4d03-b41a-d4115fbffa89', 'fixed_network': '0f59a3dd-fac1-4d03-b41a-d4115fbffa89',
'dns_nameserver': '8.8.8.8', 'dns_nameserver': '8.8.8.8',
'docker_volume_size': 5, 'docker_volume_size': 5,
'ssh_authorized_key': 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB',
'coe': 'mesos', 'coe': 'mesos',
'network_driver': 'flannel', 'network_driver': 'flannel',
'http_proxy': 'http://proxy.com:123', 'http_proxy': 'http://proxy.com:123',