openstack/fuel-library
Code Issues Proposed changes

all versions should be the same

Browse Source
This commit is contained in:
Andrey Korolyov
2013-05-24 14:40:37 +04:00
parent 68b485eb52
commit 9830a0a0ac
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fuel_test/settings.py
View File

@@ -16,8 +16,8 @@ PUPPET_VERSIONS = {
"3": '3.0.1-1.el6',
},
'ubuntu': {
"2": '3.0.1-1puppetlabs1',
"3": '3.1.0-1puppetlabs1'
"2": '2.7.19-1puppetlabs2',
"3": '3.0.1-1puppetlabs1'
},
}
@@ -29,8 +29,8 @@ PUPPET_CLIENT_PACKAGES = {
"3": 'puppet-3.0.1-1.el6',
},
'ubuntu': {
"2": 'puppet=3.0.1-1puppetlabs1 puppet-common=3.0.1-1puppetlabs1',
"3": 'puppet=3.1.0-1puppetlabs1 puppet-common=3.1.0-1puppetlabs1'
"2": 'puppet=2.7.19-1puppetlabs2 puppet-common=2.7.19-1puppetlabs2',
"3": 'puppet=3.0.1-1puppetlabs1 puppet-common=3.0.1-1puppetlabs1'
},
}

1
iso/Makefile
View File

@@ -47,6 +47,7 @@ ISOROOT:=$(BUILD_DIR)/iso/isoroot
#endif
ISOBASENAME:=fuel-centos-$(CENTOS_RELEASE)-$(CENTOS_ARCH)-$(FUEL_VERSION)
[ -z "$$ISOSUFFIX" ] || ISOBASENAME:=$(ISOBASENAME)-$(ISOSUFFIX)
#ISOBASENAME:=fuel-centos-$(CENTOS_RELEASE)-$(CENTOS_ARCH)_$(BUILD_ID)
ISONAME:=$(BUILD_DIR)/iso/$(ISOBASENAME).iso