Merge "Update openstack version to kilo in openstack.yaml"

This commit is contained in:
Jenkins 2015-07-22 08:52:54 +00:00 committed by Gerrit Code Review
commit 994f36e9c9

View File

@ -1442,8 +1442,8 @@
- pk: 1 - pk: 1
extend: *base_release extend: *base_release
fields: fields:
name: "Juno on CentOS 6.5" name: "Kilo on CentOS 6.5"
version: "2014.2.2-7.0" version: "2015.1.0-7.0"
can_update_from_versions: [] can_update_from_versions: []
operating_system: "CentOS" operating_system: "CentOS"
description: "This option will install the OpenStack Juno packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." description: "This option will install the OpenStack Juno packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
@ -1514,8 +1514,8 @@
- pk: 2 - pk: 2
extend: *base_release extend: *base_release
fields: fields:
name: "Juno on Ubuntu 14.04.1" name: "Kilo on Ubuntu 14.04.1"
version: "2014.2.2-7.0" version: "2015.1.0-7.0"
can_update_from_versions: [] can_update_from_versions: []
operating_system: "Ubuntu" operating_system: "Ubuntu"
description: "This option will install the OpenStack Juno packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." description: "This option will install the OpenStack Juno packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."