diff --git a/heat/engine/resources/openstack/heat/autoscaling_group.py b/heat/engine/resources/openstack/heat/autoscaling_group.py index bd2146d764..006523247d 100644 --- a/heat/engine/resources/openstack/heat/autoscaling_group.py +++ b/heat/engine/resources/openstack/heat/autoscaling_group.py @@ -82,7 +82,6 @@ class AutoScalingResourceGroup(aws_asg.AutoScalingGroup): ROLLING_UPDATES: properties.Schema( properties.Schema.MAP, _('Policy for rolling updates for this scaling group.'), - required=False, update_allowed=True, schema={ MIN_IN_SERVICE: properties.Schema( diff --git a/heat/engine/resources/openstack/neutron/floatingip.py b/heat/engine/resources/openstack/neutron/floatingip.py index 367b65ac91..11fdd819cc 100644 --- a/heat/engine/resources/openstack/neutron/floatingip.py +++ b/heat/engine/resources/openstack/neutron/floatingip.py @@ -47,7 +47,6 @@ class FloatingIP(neutron.NeutronResource): status=support.DEPRECATED, message=_('Use property %s.') % FLOATING_NETWORK, version='2014.2'), - required=False, constraints=[ constraints.CustomConstraint('neutron.network') ], @@ -55,7 +54,6 @@ class FloatingIP(neutron.NeutronResource): FLOATING_NETWORK: properties.Schema( properties.Schema.STRING, _('Network to allocate floating IP from.'), - required=False, support_status=support.SupportStatus(version='2014.2'), constraints=[ constraints.CustomConstraint('neutron.network') diff --git a/heat/engine/resources/openstack/neutron/loadbalancer.py b/heat/engine/resources/openstack/neutron/loadbalancer.py index d05414e85f..1a10b09e1c 100644 --- a/heat/engine/resources/openstack/neutron/loadbalancer.py +++ b/heat/engine/resources/openstack/neutron/loadbalancer.py @@ -216,7 +216,6 @@ class Pool(neutron.NeutronResource): status=support.DEPRECATED, message=_('Use property %s.') % SUBNET, version='2014.2'), - required=False, constraints=[ constraints.CustomConstraint('neutron.subnet') ] @@ -225,7 +224,6 @@ class Pool(neutron.NeutronResource): properties.Schema.STRING, _('The subnet for the port on which the members ' 'of the pool will be connected.'), - required=False, support_status=support.SupportStatus(version='2014.2'), constraints=[ constraints.CustomConstraint('neutron.subnet') diff --git a/heat/engine/resources/openstack/neutron/network_gateway.py b/heat/engine/resources/openstack/neutron/network_gateway.py index 8ca3647df7..8f74b06593 100644 --- a/heat/engine/resources/openstack/neutron/network_gateway.py +++ b/heat/engine/resources/openstack/neutron/network_gateway.py @@ -98,7 +98,6 @@ class NetworkGateway(neutron.NeutronResource): status=support.DEPRECATED, message=_('Use property %s.') % NETWORK, version='2014.2'), - required=False, constraints=[ constraints.CustomConstraint('neutron.network') ], @@ -108,7 +107,6 @@ class NetworkGateway(neutron.NeutronResource): description=_( 'The internal network to connect on ' 'the network gateway.'), - required=False, support_status=support.SupportStatus(version='2014.2'), constraints=[ constraints.CustomConstraint('neutron.network') diff --git a/heat/engine/resources/openstack/neutron/router.py b/heat/engine/resources/openstack/neutron/router.py index c1c906ea73..be15cd1e9a 100644 --- a/heat/engine/resources/openstack/neutron/router.py +++ b/heat/engine/resources/openstack/neutron/router.py @@ -413,7 +413,6 @@ class RouterGateway(neutron.NeutronResource): status=support.DEPRECATED, message=_('Use property %s.') % NETWORK, version='2014.2'), - required=False, constraints=[ constraints.CustomConstraint('neutron.network') ], @@ -421,7 +420,6 @@ class RouterGateway(neutron.NeutronResource): NETWORK: properties.Schema( properties.Schema.STRING, _('external network for the gateway.'), - required=False, constraints=[ constraints.CustomConstraint('neutron.network') ], diff --git a/heat/engine/resources/openstack/neutron/subnet.py b/heat/engine/resources/openstack/neutron/subnet.py index 524af2ca6f..37da107265 100644 --- a/heat/engine/resources/openstack/neutron/subnet.py +++ b/heat/engine/resources/openstack/neutron/subnet.py @@ -67,7 +67,6 @@ class Subnet(neutron.NeutronResource): status=support.DEPRECATED, message=_('Use property %s.') % NETWORK, version='2014.2'), - required=False, constraints=[ constraints.CustomConstraint('neutron.network') ], @@ -75,7 +74,6 @@ class Subnet(neutron.NeutronResource): NETWORK: properties.Schema( properties.Schema.STRING, _('The ID of the attached network.'), - required=False, constraints=[ constraints.CustomConstraint('neutron.network') ], diff --git a/heat/engine/resources/openstack/neutron/vpnservice.py b/heat/engine/resources/openstack/neutron/vpnservice.py index 70d4e5b01b..07a0e1291b 100644 --- a/heat/engine/resources/openstack/neutron/vpnservice.py +++ b/heat/engine/resources/openstack/neutron/vpnservice.py @@ -63,7 +63,6 @@ class VPNService(neutron.NeutronResource): status=support.DEPRECATED, message=_('Use property %s.') % SUBNET, version='2014.2'), - required=False, constraints=[ constraints.CustomConstraint('neutron.subnet') ] @@ -71,7 +70,6 @@ class VPNService(neutron.NeutronResource): SUBNET: properties.Schema( properties.Schema.STRING, _('Subnet in which the vpn service will be created.'), - required=False, support_status=support.SupportStatus(version='2014.2'), constraints=[ constraints.CustomConstraint('neutron.subnet') diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py index 1cc2059684..925ae6f02b 100644 --- a/heat/engine/resources/openstack/nova/server.py +++ b/heat/engine/resources/openstack/nova/server.py @@ -422,7 +422,6 @@ class Server(stack_user.StackUser): ADMIN_PASS: properties.Schema( properties.Schema.STRING, _('The administrator password for the server.'), - required=False, update_allowed=True ), }