openstack
/
fuel-library
Code Issues Proposed changes

Bump version to 10.0 

Fuel-CI: disable

Change-Id: Ifdaf5597bc3578ed31e22c58985cd06fefeb5d92
Related-bug: #1558589
This commit is contained in:
Sergey Kulanov 2016-03-21 13:17:41 +02:00
parent e18cd53010
commit b3e229a2ed
6 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
fuel-library10.0 (10.0.0-1) trusty; urgency=low
* Bump version to 10.0
-- Sergey Kulanov <skulanov@mirantis.com> Mon, 21 Mar 2016 12:48:56 +0200
fuel-library9.0 (9.0.0-2) trusty; urgency=low
* Add librarian-puppet-simple support

2
debian/control vendored
View File

@ -1,4 +1,4 @@
Source: fuel-library9.0
Source: fuel-library10.0
Section: admin
Priority: optional
Maintainer: Mirantis Product <product@mirantis.com>

2
debian/rules vendored
View File

@ -1,6 +1,6 @@
#!/usr/bin/make -f
export FUEL_RELEASE=9.0
export FUEL_RELEASE=10.0
export FUEL_LIB_DEST=/etc/puppet
export FULL_FUEL_LIB_DEST=/debian/fuel-library$(FUEL_RELEASE)$(FUEL_LIB_DEST)

6
deployment/puppet/fuel/lib/facter/fuel_openstack_version.rb
View File

@ -1,12 +1,6 @@
require 'facter'
fuel_openstack_version_path = '/etc/fuel_openstack_version'
# FIXME(kozhukalov): This default value is necessary
# to solve chicken/egg problem. The thing is that
# deployment tests use the ISO where this file is not
# installed. This default value should be removed
# once the ISO is updated.
read_data = "mitaka-9.0"
Facter.add('fuel_openstack_version') do
if File.exist?(fuel_openstack_version_path)

6
deployment/puppet/fuel/lib/facter/fuel_release.rb
View File

@ -1,12 +1,6 @@
require 'facter'
fuel_release_path = '/etc/fuel_release'
# FIXME(kozhukalov): This default value is necessary
# to solve chicken/egg problem. The thing is that
# deployment tests use the ISO where this file is not
# installed. This default value should be removed
# once the ISO is updated.
read_data = "9.0"
Facter.add('fuel_release') do
if File.exist?(fuel_release_path)

8
specs/fuel-library9.0.spec → specs/fuel-library10.0.spec
View File

@ -1,6 +1,6 @@
%define name fuel-library9.0
%{!?version: %define version 9.0.0}
%{!?fuel_release: %define fuel_release 9.0}
%define name fuel-library10.0
%{!?version: %define version 10.0.0}
%{!?fuel_release: %define fuel_release 10.0}
%{!?release: %define release 1}
%{!?rhel: %define rhel 7}
@ -24,7 +24,7 @@ Requires: fuel-misc python-fuelclient
%define files_source %{_builddir}/%{name}-%{version}/files
%define fuel_utils_source %{files_source}/fuel-utils
%define openstack_version mitaka-%{fuel_release}
%define openstack_version newton-%{fuel_release}
%define predefined_upstream_modules %{_sourcedir}/upstream_modules.tar.gz
%description