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:
parent
921918a3bd
commit
bd640f231c
|
@ -67,7 +67,7 @@ MASTER_NETMASK?=255.255.255.0
|
||||||
MASTER_GW?=10.20.0.1
|
MASTER_GW?=10.20.0.1
|
||||||
|
|
||||||
CENTOS_MAJOR:=6
|
CENTOS_MAJOR:=6
|
||||||
CENTOS_MINOR:=5
|
CENTOS_MINOR:=6
|
||||||
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR)
|
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR)
|
||||||
CENTOS_ARCH:=x86_64
|
CENTOS_ARCH:=x86_64
|
||||||
CENTOS_IMAGE_RELEASE:=$(CENTOS_MAJOR)$(CENTOS_MINOR)
|
CENTOS_IMAGE_RELEASE:=$(CENTOS_MAJOR)$(CENTOS_MINOR)
|
||||||
|
|
|
@ -4,19 +4,19 @@ name=Mirantis mirror
|
||||||
baseurl=file://$(LOCAL_MIRROR_CENTOS_OS_BASEURL)
|
baseurl=file://$(LOCAL_MIRROR_CENTOS_OS_BASEURL)
|
||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
enabled=1
|
enabled=1
|
||||||
priority=1
|
priority=10
|
||||||
endef
|
endef
|
||||||
define yum_upstream_repo
|
define yum_upstream_repo
|
||||||
[upstream]
|
[upstream]
|
||||||
name=Upstream mirror
|
name=Upstream mirror
|
||||||
baseurl=$(SANDBOX_MIRROR_CENTOS_UPSTREAM_OS_BASEURL)
|
baseurl=$(SANDBOX_MIRROR_CENTOS_UPSTREAM_OS_BASEURL)
|
||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
priority=2
|
priority=1
|
||||||
[upstream-updates]
|
[upstream-updates]
|
||||||
name=Upstream mirror
|
name=Upstream mirror
|
||||||
baseurl=$(SANDBOX_MIRROR_CENTOS_UPDATES_OS_BASEURL)
|
baseurl=$(SANDBOX_MIRROR_CENTOS_UPDATES_OS_BASEURL)
|
||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
priority=2
|
priority=1
|
||||||
endef
|
endef
|
||||||
define yum_epel_repo
|
define yum_epel_repo
|
||||||
[epel]
|
[epel]
|
||||||
|
@ -49,6 +49,7 @@ mkdir -p $(SANDBOX)/etc/yum.repos.d
|
||||||
cat > $(SANDBOX)/etc/yum.conf <<EOF
|
cat > $(SANDBOX)/etc/yum.conf <<EOF
|
||||||
$(sandbox_yum_conf)
|
$(sandbox_yum_conf)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cp /etc/resolv.conf $(SANDBOX)/etc/resolv.conf
|
cp /etc/resolv.conf $(SANDBOX)/etc/resolv.conf
|
||||||
cp /etc/hosts $(SANDBOX)/etc/hosts
|
cp /etc/hosts $(SANDBOX)/etc/hosts
|
||||||
cat > $(SANDBOX)/etc/yum.repos.d/base.repo <<EOF
|
cat > $(SANDBOX)/etc/yum.repos.d/base.repo <<EOF
|
||||||
|
|
Loading…
Reference in New Issue