openstack/fuel-web
Code Issues Proposed changes

Fuel 3.0.1

Browse Source
This commit is contained in:
Dmitry Pyzhov 2013-06-18 13:29:43 +04:00 committed by default
parent 73a0a3f570
commit 67e7d5a4d0
4 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config.mk
View File

@ -14,7 +14,7 @@ LOCAL_MIRROR?=$(TOP_DIR)/local_mirror
LOCAL_MIRROR:=$(abspath $(LOCAL_MIRROR))
COMMIT_SHA:=$(shell git rev-parse --verify HEAD)
PRODUCT_VERSION:=3.0
PRODUCT_VERSION:=3.0.1
FUEL_COMMIT_SHA:=$(shell cd fuel && git rev-parse --verify HEAD)
CENTOS_MAJOR:=6
@ -42,10 +42,10 @@ BUILD_MIRROR_GEMS:=$(BUILD_DIR)/packages/gems
# Use srv08 mirrors by default. Other possible default is 'msk'.
# Setting any other value or removing of this variable will cause
# download of all the packages directly from internet
USE_MIRROR?=srv08
ifeq ($(USE_MIRROR),srv08)
USE_MIRROR?=srt
ifeq ($(USE_MIRROR),srt)
YUM_REPOS?=proprietary
MIRROR_BASE?=http://srv08-srt.srt.mirantis.net/fwm/3.0
MIRROR_BASE?=http://srv08-srt.srt.mirantis.net/fwm/$(PRODUCT_VERSION)
MIRROR_CENTOS?=$(MIRROR_BASE)/centos
MIRROR_EGGS?=$(MIRROR_BASE)/eggs
MIRROR_GEMS?=$(MIRROR_BASE)/gems
@ -53,15 +53,7 @@ MIRROR_SRC?=$(MIRROR_BASE)/src
endif
ifeq ($(USE_MIRROR),msk)
YUM_REPOS?=proprietary
MIRROR_BASE?=http://172.18.8.209/fwm/3.0
MIRROR_CENTOS?=$(MIRROR_BASE)/centos
MIRROR_EGGS?=$(MIRROR_BASE)/eggs
MIRROR_GEMS?=$(MIRROR_BASE)/gems
MIRROR_SRC?=$(MIRROR_BASE)/src
endif
ifeq ($(USE_MIRROR),msk2)
YUM_REPOS?=proprietary
MIRROR_BASE?=http://172.18.8.207/fwm/3.0
MIRROR_BASE?=http://srv11-msk.msk.mirantis.net/fwm/$(PRODUCT_VERSION)
MIRROR_CENTOS?=$(MIRROR_BASE)/centos
MIRROR_EGGS?=$(MIRROR_BASE)/eggs
MIRROR_GEMS?=$(MIRROR_BASE)/gems

2
fuel

@ -1 +1 @@
Subproject commit b3cd8feecbd172ac904e1cb95aeb89426968bc96
Subproject commit c213564e5e70c5ceb858766311cbfc04eeb747bb

4
mirror/centos/yum_repos.mk
View File

@ -67,10 +67,10 @@ priority=20
endef
define yum_repo_fuel
[epel-fuel-grizzly]
[epel-fuel-grizzly-3.0.1]
name=Mirantis OpenStack Custom Packages
#mirrorlist=http://download.mirantis.com/epel-fuel-grizzly/mirror.internal.list
baseurl=http://srv08-srt.srt.mirantis.net/centos-repo/epel-fuel-grizzly/
baseurl=http://download.mirantis.com/epel-fuel-grizzly-3.0.1/
gpgcheck=0
enabled=1
priority=1

28
requirements-rpm.txt
View File

@ -47,17 +47,17 @@ openssh-clients-5.3p1-84.1.el6
openssh-server-5.3p1-84.1.el6
openssl-devel-1.0.0-27.el6_4.2
openssl098e-0.9.8e-17.el6.centos.2
openstack-cinder-2013.1.0.1-mira.3
openstack-cinder-2013.1.1.fuel3.0-mira.2
openstack-dashboard-2013.1.0.1-mira.3
openstack-glance-2013.1.0.1-mira.2
openstack-keystone-2013.1.0.1-mira.2
openstack-nova-2013.1.0.1.1.g1ad6e38-mira.2
openstack-glance-2013.1.fuel3.0-mira.3
openstack-keystone-2013.1.1.fuel3.0-mira.2
openstack-nova-2013.1.1.fuel3.0.2.gee73ed7-mira.2
openstack-nova-novncproxy-0.4-8.el6
openstack-swift-1.8.0-mira.3
openstack-swift-account-1.8.0-mira.3
openstack-swift-container-1.8.0-mira.3
openstack-swift-object-1.8.0-mira.3
openstack-swift-proxy-1.8.0-mira.3
openstack-swift-1.8.0.fuel3.0-mira.2
openstack-swift-account-1.8.0.fuel3.0-mira.2
openstack-swift-container-1.8.0.fuel3.0-mira.2
openstack-swift-object-1.8.0.fuel3.0-mira.2
openstack-swift-proxy-1.8.0.fuel3.0-mira.2
openstack-utils-2013.1-1.el6
pacemaker-1.1.8-7.el6
patch-2.6-6.el6
@ -72,10 +72,10 @@ puppetdb-1.2.0-1.el6
puppetdb-terminus-1.2.0-1.el6
python-amqp-1.2.0-6.el6
python-argparse-1.2.1-2.el6
python-cinder-2013.1.0.1-mira.3
python-cinder-2013.1.1.fuel3.0-mira.2
python-devel-2.6.6-36.el6
python-keystone-2013.1.0.1-mira.2
python-novaclient-2.13.0-mira.2
python-keystone-2013.1.1.fuel3.0-mira.2
python-novaclient-2.13.0.fuel3.0-mira.2
python-pip-0.8-1.el6
python-setuptools-0.6.10-3.el6
python-virtualenv-1.7.2-1.el6
@ -97,9 +97,9 @@ rubygem-stomp-1.2.8-1.el6
rubygems-1.3.7-1.el6
scapy-2.0.0.10-5.el6
screen-4.0.3-16.el6
selinux-policy-targeted-3.7.19-195.el6_4.5
selinux-policy-targeted-3.7.19-195.el6_4.10
socat-1.7.2.1-1.el6
supervisor-3.0a12-0.11.el6
supervisor-3.0a12-0.12.el6
syslinux-4.02-8.el6
system-config-firewall-base-1.2.27-5.el6
tcpdump-4.0.0-3.20090921gitdf3cb4.2.el6