openstack
/
fuel-main
Code Issues Proposed changes

Update Fuel master node build system to 6.6 mirrors with updates. 

This also requires swapping priorities for Mirantis and upstream
repos, to ensure that packages will be actually updated.

Related-Bug: #1476245
Change-Id: I7509ecca711737ab7a307dc573bf99c71fa62a21
This commit is contained in:
Aleksandr Mogylchenko 2015-07-27 18:19:36 +03:00
parent 921918a3bd
commit bd640f231c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.mk
View File

@ -67,7 +67,7 @@ MASTER_NETMASK?=255.255.255.0
MASTER_GW?=10.20.0.1
CENTOS_MAJOR:=6
CENTOS_MINOR:=5
CENTOS_MINOR:=6
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR)
CENTOS_ARCH:=x86_64
CENTOS_IMAGE_RELEASE:=$(CENTOS_MAJOR)$(CENTOS_MINOR)

7
sandbox.mk
View File

@ -4,19 +4,19 @@ name=Mirantis mirror
baseurl=file://$(LOCAL_MIRROR_CENTOS_OS_BASEURL)
gpgcheck=0
enabled=1
priority=1
priority=10
endef
define yum_upstream_repo
[upstream]
name=Upstream mirror
baseurl=$(SANDBOX_MIRROR_CENTOS_UPSTREAM_OS_BASEURL)
gpgcheck=0
priority=2
priority=1
[upstream-updates]
name=Upstream mirror
baseurl=$(SANDBOX_MIRROR_CENTOS_UPDATES_OS_BASEURL)
gpgcheck=0
priority=2
priority=1
endef
define yum_epel_repo
[epel]
@ -49,6 +49,7 @@ mkdir -p $(SANDBOX)/etc/yum.repos.d
cat > $(SANDBOX)/etc/yum.conf <<EOF
$(sandbox_yum_conf)
EOF
cp /etc/resolv.conf $(SANDBOX)/etc/resolv.conf
cp /etc/hosts $(SANDBOX)/etc/hosts
cat > $(SANDBOX)/etc/yum.repos.d/base.repo <<EOF