From 423110ef6ebd2b2dc49c8408c37e2f5292639e8d Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 16 Jun 2015 19:49:14 +0000 Subject: [PATCH] Update version for Liberty Update the version for Liberty, switching from date-based versioning to pre-versioning using SemVer. See http://lists.openstack.org/pipermail/openstack-dev/2015-May/065211.html and http://lists.openstack.org/pipermail/openstack-dev/2015-June/067082.html for details. Also new version was updated in resources with SupportStatus version 2015.2. Change-Id: I6a35fa0dda798fad93b804d00a46af80f08d475c --- .../heat_docker/resources/docker_container.py | 6 ++--- doc/source/ext/resources.py | 2 +- .../resources/openstack/barbican/order.py | 26 +++++++++---------- .../openstack/cinder/cinder_volume_type.py | 4 +-- .../resources/openstack/cinder/volume.py | 2 +- .../openstack/heat/scaling_policy.py | 2 +- .../openstack/heat/software_deployment.py | 2 +- .../resources/openstack/keystone/endpoint.py | 2 +- .../resources/openstack/keystone/service.py | 2 +- .../openstack/manila/security_service.py | 2 +- .../resources/openstack/manila/share_type.py | 2 +- .../openstack/mistral/cron_trigger.py | 2 +- .../resources/openstack/neutron/floatingip.py | 2 +- .../openstack/neutron/loadbalancer.py | 4 +-- .../resources/openstack/trove/os_database.py | 4 +-- setup.cfg | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/contrib/heat_docker/heat_docker/resources/docker_container.py b/contrib/heat_docker/heat_docker/resources/docker_container.py index 5ad30738c1..9a9038dd48 100644 --- a/contrib/heat_docker/heat_docker/resources/docker_container.py +++ b/contrib/heat_docker/heat_docker/resources/docker_container.py @@ -247,7 +247,7 @@ class DockerContainer(resource.Resource): 'processing power(only supported for API version >= %s).') % MIN_API_VERSION_MAP['cpu_shares'], default=0, - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), DEVICES: properties.Schema( properties.Schema.LIST, @@ -288,14 +288,14 @@ class DockerContainer(resource.Resource): } ), default=[], - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), CPU_SET: properties.Schema( properties.Schema.STRING, _('The CPUs in which to allow execution ' '(only supported for API version >= %s).') % MIN_API_VERSION_MAP['cpu_set'], - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ) } diff --git a/doc/source/ext/resources.py b/doc/source/ext/resources.py index f6c2028d1d..99ad6669a7 100644 --- a/doc/source/ext/resources.py +++ b/doc/source/ext/resources.py @@ -31,7 +31,7 @@ _CODE_NAMES = {'2013.1': 'Grizzly', '2014.1': 'Icehouse', '2014.2': 'Juno', '2015.1': 'Kilo', - '2015.2': 'Liberty'} + '5.0.0': 'Liberty'} all_resources = {} diff --git a/heat/engine/resources/openstack/barbican/order.py b/heat/engine/resources/openstack/barbican/order.py index be3315e43f..ce95fe3085 100644 --- a/heat/engine/resources/openstack/barbican/order.py +++ b/heat/engine/resources/openstack/barbican/order.py @@ -85,42 +85,42 @@ class Order(resource.Resource): 'key', 'asymmetric', 'certificate' ]), ], - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), REQUEST_TYPE: properties.Schema( properties.Schema.STRING, _('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( properties.Schema.STRING, _('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( properties.Schema.STRING, _('The source of certificate request.'), - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), CA_ID: properties.Schema( properties.Schema.STRING, _('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( properties.Schema.STRING, _('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( properties.Schema.STRING, _('The content of the CSR.'), - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), PASS_PHRASE: properties.Schema( properties.Schema.STRING, _('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.')), CONTAINER_REF: attributes.Schema( _('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( _('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( _('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( _('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( _('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): diff --git a/heat/engine/resources/openstack/cinder/cinder_volume_type.py b/heat/engine/resources/openstack/cinder/cinder_volume_type.py index 2e6e5b2772..3b108452bd 100644 --- a/heat/engine/resources/openstack/cinder/cinder_volume_type.py +++ b/heat/engine/resources/openstack/cinder/cinder_volume_type.py @@ -67,13 +67,13 @@ class CinderVolumeType(resource.Resource): properties.Schema.BOOLEAN, _('Whether the volume type is accessible to the public.'), default=True, - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), DESCRIPTION: properties.Schema( properties.Schema.STRING, _('Description of the volume type.'), update_allowed=True, - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), } diff --git a/heat/engine/resources/openstack/cinder/volume.py b/heat/engine/resources/openstack/cinder/volume.py index acb2058c0e..cb56fa1a2b 100644 --- a/heat/engine/resources/openstack/cinder/volume.py +++ b/heat/engine/resources/openstack/cinder/volume.py @@ -134,7 +134,7 @@ class CinderVolume(vb.BaseVolume): READ_ONLY: properties.Schema( properties.Schema.BOOLEAN, _('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, ), } diff --git a/heat/engine/resources/openstack/heat/scaling_policy.py b/heat/engine/resources/openstack/heat/scaling_policy.py index 4d40b838c7..957f5ed5df 100644 --- a/heat/engine/resources/openstack/heat/scaling_policy.py +++ b/heat/engine/resources/openstack/heat/scaling_policy.py @@ -105,7 +105,7 @@ class AutoScalingPolicy(signal_responder.SignalResponder, ), SIGNAL_URL: attributes.Schema( _("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 ), } diff --git a/heat/engine/resources/openstack/heat/software_deployment.py b/heat/engine/resources/openstack/heat/software_deployment.py index a2b1894c1c..6a84ac2fd2 100644 --- a/heat/engine/resources/openstack/heat/software_deployment.py +++ b/heat/engine/resources/openstack/heat/software_deployment.py @@ -583,7 +583,7 @@ class SoftwareDeployment(signal_responder.SignalResponder): class SoftwareDeploymentGroup(resource_group.ResourceGroup): - support_status = support.SupportStatus(version='2015.2') + support_status = support.SupportStatus(version='5.0.0') PROPERTIES = ( SERVERS, diff --git a/heat/engine/resources/openstack/keystone/endpoint.py b/heat/engine/resources/openstack/keystone/endpoint.py index 7d41bae36a..56f2542f2a 100644 --- a/heat/engine/resources/openstack/keystone/endpoint.py +++ b/heat/engine/resources/openstack/keystone/endpoint.py @@ -22,7 +22,7 @@ class KeystoneEndpoint(resource.Resource): """Heat Template Resource for Keystone Service Endpoint.""" support_status = support.SupportStatus( - version='2015.2', + version='5.0.0', message=_('Supported versions: keystone v3')) default_client_name = 'keystone' diff --git a/heat/engine/resources/openstack/keystone/service.py b/heat/engine/resources/openstack/keystone/service.py index bf64db6322..46cb442a56 100644 --- a/heat/engine/resources/openstack/keystone/service.py +++ b/heat/engine/resources/openstack/keystone/service.py @@ -21,7 +21,7 @@ class KeystoneService(resource.Resource): """Heat Template Resource for Keystone Service.""" support_status = support.SupportStatus( - version='2015.2', + version='5.0.0', message=_('Supported versions: keystone v3')) default_client_name = 'keystone' diff --git a/heat/engine/resources/openstack/manila/security_service.py b/heat/engine/resources/openstack/manila/security_service.py index 373ee8083d..027bffedcb 100644 --- a/heat/engine/resources/openstack/manila/security_service.py +++ b/heat/engine/resources/openstack/manila/security_service.py @@ -25,7 +25,7 @@ class SecurityService(resource.Resource): Active Directory domain or a Kerberos domain. """ - support_status = support.SupportStatus(version='2015.2') + support_status = support.SupportStatus(version='5.0.0') PROPERTIES = ( NAME, TYPE, DNS_IP, SERVER, DOMAIN, USER, diff --git a/heat/engine/resources/openstack/manila/share_type.py b/heat/engine/resources/openstack/manila/share_type.py index 8baf49e90b..d50866cf6d 100644 --- a/heat/engine/resources/openstack/manila/share_type.py +++ b/heat/engine/resources/openstack/manila/share_type.py @@ -31,7 +31,7 @@ class ManilaShareType(resource.Resource): without administration grants. """ - support_status = support.SupportStatus(version='2015.2') + support_status = support.SupportStatus(version='5.0.0') PROPERTIES = ( NAME, IS_PUBLIC, DRIVER_HANDLES_SHARE_SERVERS, EXTRA_SPECS diff --git a/heat/engine/resources/openstack/mistral/cron_trigger.py b/heat/engine/resources/openstack/mistral/cron_trigger.py index 375bbba207..e1bb42df39 100644 --- a/heat/engine/resources/openstack/mistral/cron_trigger.py +++ b/heat/engine/resources/openstack/mistral/cron_trigger.py @@ -20,7 +20,7 @@ from heat.engine import support class CronTrigger(resource.Resource): - support_status = support.SupportStatus(version='2015.2') + support_status = support.SupportStatus(version='5.0.0') PROPERTIES = ( NAME, PATTERN, WORKFLOW, FIRST_TIME, COUNT diff --git a/heat/engine/resources/openstack/neutron/floatingip.py b/heat/engine/resources/openstack/neutron/floatingip.py index 37ae688511..28e36b1b8d 100644 --- a/heat/engine/resources/openstack/neutron/floatingip.py +++ b/heat/engine/resources/openstack/neutron/floatingip.py @@ -91,7 +91,7 @@ class FloatingIP(neutron.NeutronResource): constraints=[ constraints.CustomConstraint('ip_addr') ], - support_status=support.SupportStatus(version='2015.2'), + support_status=support.SupportStatus(version='5.0.0'), ), } diff --git a/heat/engine/resources/openstack/neutron/loadbalancer.py b/heat/engine/resources/openstack/neutron/loadbalancer.py index 9842833921..4edd34618e 100644 --- a/heat/engine/resources/openstack/neutron/loadbalancer.py +++ b/heat/engine/resources/openstack/neutron/loadbalancer.py @@ -271,7 +271,7 @@ class Pool(neutron.NeutronResource): PROVIDER: properties.Schema( properties.Schema.STRING, _('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( properties.Schema.MAP, @@ -383,7 +383,7 @@ class Pool(neutron.NeutronResource): ), PROVIDER_ATTR: attributes.Schema( _('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, ), } diff --git a/heat/engine/resources/openstack/trove/os_database.py b/heat/engine/resources/openstack/trove/os_database.py index 10a3007d6c..30bf3714e4 100644 --- a/heat/engine/resources/openstack/trove/os_database.py +++ b/heat/engine/resources/openstack/trove/os_database.py @@ -254,12 +254,12 @@ class OSDBInstance(resource.Resource): REPLICA_OF: properties.Schema( properties.Schema.STRING, _('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( properties.Schema.INTEGER, _('The number of replicas to be created.'), - support_status=support.SupportStatus(version='2015.2') + support_status=support.SupportStatus(version='5.0.0') ), } diff --git a/setup.cfg b/setup.cfg index c652ff5057..be0b62e170 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = heat -version = 2015.2 +version = 5.0.0 summary = OpenStack Orchestration description-file = README.rst