openstack/heat
Code Issues Proposed changes

Merge "Update version for Liberty"

Browse Source
This commit is contained in:
Jenkins 2015-06-22 14:22:09 +00:00 committed by Gerrit Code Review
commit c512e0fb87
16 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/heat_docker/heat_docker/resources/docker_container.py
View File

@ -247,7 +247,7 @@ class DockerContainer(resource.Resource):
'processing power(only supported for API version >= %s).') % 'processing power(only supported for API version >= %s).') %
MIN_API_VERSION_MAP['cpu_shares'], MIN_API_VERSION_MAP['cpu_shares'],
default=0, default=0,
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
DEVICES: properties.Schema( DEVICES: properties.Schema(
properties.Schema.LIST, properties.Schema.LIST,
@ -288,14 +288,14 @@ class DockerContainer(resource.Resource):
} }
), ),
default=[], default=[],
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
CPU_SET: properties.Schema( CPU_SET: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The CPUs in which to allow execution ' _('The CPUs in which to allow execution '
'(only supported for API version >= %s).') % '(only supported for API version >= %s).') %
MIN_API_VERSION_MAP['cpu_set'], MIN_API_VERSION_MAP['cpu_set'],
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
) )
} }

2
doc/source/ext/resources.py
View File

@ -31,7 +31,7 @@ _CODE_NAMES = {'2013.1': 'Grizzly',
'2014.1': 'Icehouse', '2014.1': 'Icehouse',
'2014.2': 'Juno', '2014.2': 'Juno',
'2015.1': 'Kilo', '2015.1': 'Kilo',
'2015.2': 'Liberty'} '5.0.0': 'Liberty'}
all_resources = {} all_resources = {}

26
heat/engine/resources/openstack/barbican/order.py
View File

@ -85,42 +85,42 @@ class Order(resource.Resource):
'key', 'asymmetric', 'certificate' 'key', 'asymmetric', 'certificate'
]), ]),
], ],
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
REQUEST_TYPE: properties.Schema( REQUEST_TYPE: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The type of the certificate request.'), _('The type of the certificate request.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
SUBJECT_DN: properties.Schema( SUBJECT_DN: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The subject of the certificate request.'), _('The subject of the certificate request.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
SOURCE_CONTAINER_REF: properties.Schema( SOURCE_CONTAINER_REF: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The source of certificate request.'), _('The source of certificate request.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
CA_ID: properties.Schema( CA_ID: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The identifier of the CA to use.'), _('The identifier of the CA to use.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
PROFILE: properties.Schema( PROFILE: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The profile of certificate to use.'), _('The profile of certificate to use.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
REQUEST_DATA: properties.Schema( REQUEST_DATA: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The content of the CSR.'), _('The content of the CSR.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
PASS_PHRASE: properties.Schema( PASS_PHRASE: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The passphrase the created key.'), _('The passphrase the created key.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
} }
@ -130,19 +130,19 @@ class Order(resource.Resource):
SECRET_REF: attributes.Schema(_('The URI to the created secret.')), SECRET_REF: attributes.Schema(_('The URI to the created secret.')),
CONTAINER_REF: attributes.Schema( CONTAINER_REF: attributes.Schema(
_('The URI to the created container.'), _('The URI to the created container.'),
support_status=support.SupportStatus(version='2015.2')), support_status=support.SupportStatus(version='5.0.0')),
PUBLIC_KEY: attributes.Schema( PUBLIC_KEY: attributes.Schema(
_('The payload of the created public key, if available.'), _('The payload of the created public key, if available.'),
support_status=support.SupportStatus(version='2015.2')), support_status=support.SupportStatus(version='5.0.0')),
PRIVATE_KEY: attributes.Schema( PRIVATE_KEY: attributes.Schema(
_('The payload of the created private key, if available.'), _('The payload of the created private key, if available.'),
support_status=support.SupportStatus(version='2015.2')), support_status=support.SupportStatus(version='5.0.0')),
CERTIFICATE: attributes.Schema( CERTIFICATE: attributes.Schema(
_('The payload of the created certificate, if available.'), _('The payload of the created certificate, if available.'),
support_status=support.SupportStatus(version='2015.2')), support_status=support.SupportStatus(version='5.0.0')),
INTERMEDIATES: attributes.Schema( INTERMEDIATES: attributes.Schema(
_('The payload of the created intermediates, if available.'), _('The payload of the created intermediates, if available.'),
support_status=support.SupportStatus(version='2015.2')), support_status=support.SupportStatus(version='5.0.0')),
} }
def barbican(self): def barbican(self):

4
heat/engine/resources/openstack/cinder/cinder_volume_type.py
View File

@ -67,13 +67,13 @@ class CinderVolumeType(resource.Resource):
properties.Schema.BOOLEAN, properties.Schema.BOOLEAN,
_('Whether the volume type is accessible to the public.'), _('Whether the volume type is accessible to the public.'),
default=True, default=True,
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
DESCRIPTION: properties.Schema( DESCRIPTION: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('Description of the volume type.'), _('Description of the volume type.'),
update_allowed=True, update_allowed=True,
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
} }

2
heat/engine/resources/openstack/cinder/volume.py
View File

@ -134,7 +134,7 @@ class CinderVolume(vb.BaseVolume):
READ_ONLY: properties.Schema( READ_ONLY: properties.Schema(
properties.Schema.BOOLEAN, properties.Schema.BOOLEAN,
_('Enables or disables read-only access mode of volume.'), _('Enables or disables read-only access mode of volume.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
update_allowed=True, update_allowed=True,
), ),
} }

2
heat/engine/resources/openstack/heat/scaling_policy.py
View File

@ -105,7 +105,7 @@ class AutoScalingPolicy(signal_responder.SignalResponder,
), ),
SIGNAL_URL: attributes.Schema( SIGNAL_URL: attributes.Schema(
_("A url to handle the alarm using native API."), _("A url to handle the alarm using native API."),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
type=attributes.Schema.STRING type=attributes.Schema.STRING
), ),
} }

2
heat/engine/resources/openstack/heat/software_deployment.py
View File

@ -583,7 +583,7 @@ class SoftwareDeployment(signal_responder.SignalResponder):
class SoftwareDeploymentGroup(resource_group.ResourceGroup): class SoftwareDeploymentGroup(resource_group.ResourceGroup):
support_status = support.SupportStatus(version='2015.2') support_status = support.SupportStatus(version='5.0.0')
PROPERTIES = ( PROPERTIES = (
SERVERS, SERVERS,

2
heat/engine/resources/openstack/keystone/endpoint.py
View File

@ -22,7 +22,7 @@ class KeystoneEndpoint(resource.Resource):
"""Heat Template Resource for Keystone Service Endpoint.""" """Heat Template Resource for Keystone Service Endpoint."""
support_status = support.SupportStatus( support_status = support.SupportStatus(
version='2015.2', version='5.0.0',
message=_('Supported versions: keystone v3')) message=_('Supported versions: keystone v3'))
default_client_name = 'keystone' default_client_name = 'keystone'

2
heat/engine/resources/openstack/keystone/service.py
View File

@ -21,7 +21,7 @@ class KeystoneService(resource.Resource):
"""Heat Template Resource for Keystone Service.""" """Heat Template Resource for Keystone Service."""
support_status = support.SupportStatus( support_status = support.SupportStatus(
version='2015.2', version='5.0.0',
message=_('Supported versions: keystone v3')) message=_('Supported versions: keystone v3'))
default_client_name = 'keystone' default_client_name = 'keystone'

2
heat/engine/resources/openstack/manila/security_service.py
View File

@ -25,7 +25,7 @@ class SecurityService(resource.Resource):
Active Directory domain or a Kerberos domain. Active Directory domain or a Kerberos domain.
""" """
support_status = support.SupportStatus(version='2015.2') support_status = support.SupportStatus(version='5.0.0')
PROPERTIES = ( PROPERTIES = (
NAME, TYPE, DNS_IP, SERVER, DOMAIN, USER, NAME, TYPE, DNS_IP, SERVER, DOMAIN, USER,

2
heat/engine/resources/openstack/manila/share_type.py
View File

@ -31,7 +31,7 @@ class ManilaShareType(resource.Resource):
without administration grants. without administration grants.
""" """
support_status = support.SupportStatus(version='2015.2') support_status = support.SupportStatus(version='5.0.0')
PROPERTIES = ( PROPERTIES = (
NAME, IS_PUBLIC, DRIVER_HANDLES_SHARE_SERVERS, EXTRA_SPECS NAME, IS_PUBLIC, DRIVER_HANDLES_SHARE_SERVERS, EXTRA_SPECS

2
heat/engine/resources/openstack/mistral/cron_trigger.py
View File

@ -20,7 +20,7 @@ from heat.engine import support
class CronTrigger(resource.Resource): class CronTrigger(resource.Resource):
support_status = support.SupportStatus(version='2015.2') support_status = support.SupportStatus(version='5.0.0')
PROPERTIES = ( PROPERTIES = (
NAME, PATTERN, WORKFLOW, FIRST_TIME, COUNT NAME, PATTERN, WORKFLOW, FIRST_TIME, COUNT

2
heat/engine/resources/openstack/neutron/floatingip.py
View File

@ -91,7 +91,7 @@ class FloatingIP(neutron.NeutronResource):
constraints=[ constraints=[
constraints.CustomConstraint('ip_addr') constraints.CustomConstraint('ip_addr')
], ],
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
} }

4
heat/engine/resources/openstack/neutron/loadbalancer.py
View File

@ -271,7 +271,7 @@ class Pool(neutron.NeutronResource):
PROVIDER: properties.Schema( PROVIDER: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('LBaaS provider to implement this load balancer instance.'), _('LBaaS provider to implement this load balancer instance.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
), ),
VIP: properties.Schema( VIP: properties.Schema(
properties.Schema.MAP, properties.Schema.MAP,
@ -383,7 +383,7 @@ class Pool(neutron.NeutronResource):
), ),
PROVIDER_ATTR: attributes.Schema( PROVIDER_ATTR: attributes.Schema(
_('Provider implementing this load balancer instance.'), _('Provider implementing this load balancer instance.'),
support_status=support.SupportStatus(version='2015.2'), support_status=support.SupportStatus(version='5.0.0'),
type=attributes.Schema.STRING, type=attributes.Schema.STRING,
), ),
} }

4
heat/engine/resources/openstack/trove/os_database.py
View File

@ -254,12 +254,12 @@ class OSDBInstance(resource.Resource):
REPLICA_OF: properties.Schema( REPLICA_OF: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('Identifier of the source instance to replicate.'), _('Identifier of the source instance to replicate.'),
support_status=support.SupportStatus(version='2015.2') support_status=support.SupportStatus(version='5.0.0')
), ),
REPLICA_COUNT: properties.Schema( REPLICA_COUNT: properties.Schema(
properties.Schema.INTEGER, properties.Schema.INTEGER,
_('The number of replicas to be created.'), _('The number of replicas to be created.'),
support_status=support.SupportStatus(version='2015.2') support_status=support.SupportStatus(version='5.0.0')
), ),
} }

2
setup.cfg
View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = heat name = heat
version = 2015.2 version = 5.0.0
summary = OpenStack Orchestration summary = OpenStack Orchestration
description-file = description-file =
README.rst README.rst