openstack/fuel-web
Code Issues Proposed changes

Centos 6.4

Browse Source
This commit is contained in:
Dmitry Pyzhov 2013-05-30 16:47:14 +04:00 committed by default
parent a468bb78a2
commit a2212a2820
8 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.mk
View File

@ -17,7 +17,7 @@ COMMIT_SHA:=$(shell git rev-parse --verify HEAD)
PRODUCT_VERSION:=1.0-rc1 PRODUCT_VERSION:=1.0-rc1
CENTOS_MAJOR:=6 CENTOS_MAJOR:=6
CENTOS_MINOR:=3 CENTOS_MINOR:=4
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR) CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR)
CENTOS_ARCH:=x86_64 CENTOS_ARCH:=x86_64
@ -34,7 +34,7 @@ LOCAL_MIRROR_SRC:=$(LOCAL_MIRROR)/src
LOCAL_MIRROR_EGGS:=$(LOCAL_MIRROR)/eggs LOCAL_MIRROR_EGGS:=$(LOCAL_MIRROR)/eggs
LOCAL_MIRROR_GEMS:=$(LOCAL_MIRROR)/gems LOCAL_MIRROR_GEMS:=$(LOCAL_MIRROR)/gems
LOCAL_MIRROR_CENTOS:=$(LOCAL_MIRROR)/centos LOCAL_MIRROR_CENTOS:=$(LOCAL_MIRROR)/centos
LOCAL_MIRROR_CENTOS_OS_BASEURL:=$(LOCAL_MIRROR_CENTOS)/$(CENTOS_RELEASE)/os/$(CENTOS_ARCH) LOCAL_MIRROR_CENTOS_OS_BASEURL:=$(LOCAL_MIRROR_CENTOS)/os/$(CENTOS_ARCH)
BUILD_MIRROR_GEMS:=$(BUILD_DIR)/packages/gems BUILD_MIRROR_GEMS:=$(BUILD_DIR)/packages/gems
@ -67,8 +67,8 @@ MIRROR_GEMS?=$(MIRROR_BASE)/gems
MIRROR_SRC?=$(MIRROR_BASE)/src MIRROR_SRC?=$(MIRROR_BASE)/src
endif endif
MIRROR_CENTOS?=http://archive.kernel.org/centos MIRROR_CENTOS?=http://mirror.yandex.ru/centos/$(CENTOS_RELEASE)
MIRROR_CENTOS_OS_BASEURL:=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/os/$(CENTOS_ARCH) MIRROR_CENTOS_OS_BASEURL:=$(MIRROR_CENTOS)/os/$(CENTOS_ARCH)
# It can be any a list of links (--find-links) or a pip index (--index-url). # It can be any a list of links (--find-links) or a pip index (--index-url).
MIRROR_EGGS?=http://pypi.python.org/simple MIRROR_EGGS?=http://pypi.python.org/simple
# NOTE(mihgen): removed gemcutter - it redirects to rubygems.org and has issues w/certificate now # NOTE(mihgen): removed gemcutter - it redirects to rubygems.org and has issues w/certificate now

14
iso/ks.cfg
View File

@ -218,12 +218,12 @@ fi
# Copying Repo to the nailgun /var/www directory # Copying Repo to the nailgun /var/www directory
repodir="/var/www/nailgun" repodir="/var/www/nailgun"
mkdir -p ${repodir}/centos/6.3/nailgun/x86_64 mkdir -p ${repodir}/centos/fuelweb/x86_64
cp -r ${SOURCE}/images ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/images ${repodir}/centos/fuelweb/x86_64
cp -r ${SOURCE}/isolinux ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/isolinux ${repodir}/centos/fuelweb/x86_64
cp -r ${SOURCE}/repodata ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/repodata ${repodir}/centos/fuelweb/x86_64
cp -r ${SOURCE}/Packages ${repodir}/centos/6.3/nailgun/x86_64 cp -r ${SOURCE}/Packages ${repodir}/centos/fuelweb/x86_64
cp ${SOURCE}/.treeinfo ${repodir}/centos/6.3/nailgun/x86_64 cp ${SOURCE}/.treeinfo ${repodir}/centos/fuelweb/x86_64
# Copying eggs/gems to the nailgun directory # Copying eggs/gems to the nailgun directory
cp -r ${SOURCE}/eggs ${repodir} cp -r ${SOURCE}/eggs ${repodir}
@ -253,7 +253,7 @@ rm /etc/yum.repos.d/CentOS*.repo
cat > /etc/yum.repos.d/nailgun.repo << EOF cat > /etc/yum.repos.d/nailgun.repo << EOF
[nailgun] [nailgun]
name=Nailgun Local Repo name=Nailgun Local Repo
baseurl=file:/var/www/nailgun/centos/6.3/nailgun/x86_64 baseurl=file:/var/www/nailgun/centos/fuelweb/x86_64
gpgcheck=0 gpgcheck=0
EOF EOF

12
mirror/centos/yum_repos.mk
View File

@ -18,7 +18,7 @@ define yum_repo_official
[base] [base]
name=CentOS-$(CENTOS_RELEASE) - Base name=CentOS-$(CENTOS_RELEASE) - Base
#mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=os #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=os
baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/os/$(CENTOS_ARCH) baseurl=$(MIRROR_CENTOS)/os/$(CENTOS_ARCH)
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
priority=10 priority=10
@ -26,7 +26,7 @@ priority=10
[updates] [updates]
name=CentOS-$(CENTOS_RELEASE) - Updates name=CentOS-$(CENTOS_RELEASE) - Updates
#mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=updates #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=updates
baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/updates/$(CENTOS_ARCH) baseurl=$(MIRROR_CENTOS)/updates/$(CENTOS_ARCH)
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
priority=10 priority=10
@ -34,7 +34,7 @@ priority=10
[extras] [extras]
name=CentOS-$(CENTOS_RELEASE) - Extras name=CentOS-$(CENTOS_RELEASE) - Extras
#mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=extras #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=extras
baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/extras/$(CENTOS_ARCH) baseurl=$(MIRROR_CENTOS)/extras/$(CENTOS_ARCH)
gpgcheck=0 gpgcheck=0
enabled=0 enabled=0
priority=10 priority=10
@ -42,7 +42,7 @@ priority=10
[centosplus] [centosplus]
name=CentOS-$(CENTOS_RELEASE) - Plus name=CentOS-$(CENTOS_RELEASE) - Plus
#mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=centosplus #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=centosplus
baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/centosplus/$(CENTOS_ARCH) baseurl=$(MIRROR_CENTOS)/centosplus/$(CENTOS_ARCH)
gpgcheck=0 gpgcheck=0
enabled=0 enabled=0
priority=10 priority=10
@ -50,7 +50,7 @@ priority=10
[contrib] [contrib]
name=CentOS-$(CENTOS_RELEASE) - Contrib name=CentOS-$(CENTOS_RELEASE) - Contrib
#mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=contrib #mirrorlist=http://mirrorlist.centos.org/?release=$(CENTOS_RELEASE)&arch=$(CENTOS_ARCH)&repo=contrib
baseurl=$(MIRROR_CENTOS)/$(CENTOS_RELEASE)/contrib/$(CENTOS_ARCH) baseurl=$(MIRROR_CENTOS)/contrib/$(CENTOS_ARCH)
gpgcheck=0 gpgcheck=0
enabled=0 enabled=0
priority=10 priority=10
@ -145,7 +145,7 @@ endef
define yum_repo_proprietary define yum_repo_proprietary
[proprietary] [proprietary]
name = RHEL $(CENTOS_RELEASE) - Proprietary name = RHEL $(CENTOS_RELEASE) - Proprietary
baseurl = $(MIRROR_CENTOS)/$(CENTOS_RELEASE)/os/$(CENTOS_ARCH) baseurl = $(MIRROR_CENTOS)/os/$(CENTOS_ARCH)
gpgcheck = 0 gpgcheck = 0
enabled = 1 enabled = 1
priority=1 priority=1

2
nailgun/nailgun/settings.yaml
View File

@ -62,7 +62,7 @@ MASTER_IP: "127.0.0.1"
COBBLER_URL: "http://localhost/cobbler_api" COBBLER_URL: "http://localhost/cobbler_api"
COBBLER_USER: "cobbler" COBBLER_USER: "cobbler"
COBBLER_PASSWORD: "cobbler" COBBLER_PASSWORD: "cobbler"
COBBLER_PROFILE: "centos63-x86_64" COBBLER_PROFILE: "centos-x86_64"
TRUNCATE_LOG_ENTRIES: 100 TRUNCATE_LOG_ENTRIES: 100
UI_LOG_DATE_FORMAT: '%Y-%m-%d %H:%M:%S' UI_LOG_DATE_FORMAT: '%Y-%m-%d %H:%M:%S'

2
puppet/nailgun/examples/site.pp
View File

@ -7,7 +7,7 @@ node default {
{ {
"id" => "nailgun", "id" => "nailgun",
"name" => "Nailgun", "name" => "Nailgun",
"url" => "http://${ipaddress}:8080/centos/6.3/nailgun/x86_64" "url" => "http://${ipaddress}:8080/centos/fuelweb/x86_64"
}, },
] ]

20
puppet/nailgun/manifests/cobbler.pp
View File

@ -82,10 +82,10 @@ class nailgun::cobbler(
require => Class["cobbler::server"], require => Class["cobbler::server"],
} }
# THIS VARIABLE IS NEEDED FOR TEMPLATING centos63-x86_64.ks # THIS VARIABLE IS NEEDED FOR TEMPLATING centos-x86_64.ks
$ks_repo = $centos_repos $ks_repo = $centos_repos
file { "/var/lib/cobbler/kickstarts/centos63-x86_64.ks": file { "/var/lib/cobbler/kickstarts/centos-x86_64.ks":
content => template("nailgun/cobbler/centos.ks.erb"), content => template("nailgun/cobbler/centos.ks.erb"),
owner => root, owner => root,
group => root, group => root,
@ -93,23 +93,23 @@ class nailgun::cobbler(
require => Class["cobbler::server"], require => Class["cobbler::server"],
} -> } ->
cobbler_distro { "centos63-x86_64": cobbler_distro { "centos-x86_64":
kernel => "${repo_root}/centos/6.3/nailgun/x86_64/isolinux/vmlinuz", kernel => "${repo_root}/centos/fuelweb/x86_64/isolinux/vmlinuz",
initrd => "${repo_root}/centos/6.3/nailgun/x86_64/isolinux/initrd.img", initrd => "${repo_root}/centos/fuelweb/x86_64/isolinux/initrd.img",
arch => "x86_64", arch => "x86_64",
breed => "redhat", breed => "redhat",
osversion => "rhel6", osversion => "rhel6",
ksmeta => "tree=http://@@server@@:8080/centos/6.3/nailgun/x86_64", ksmeta => "tree=http://@@server@@:8080/centos/fuelweb/x86_64/",
require => Class["cobbler::server"], require => Class["cobbler::server"],
} }
cobbler_profile { "centos63-x86_64": cobbler_profile { "centos-x86_64":
kickstart => "/var/lib/cobbler/kickstarts/centos63-x86_64.ks", kickstart => "/var/lib/cobbler/kickstarts/centos-x86_64.ks",
kopts => "", kopts => "",
distro => "centos63-x86_64", distro => "centos-x86_64",
ksmeta => "", ksmeta => "",
menu => true, menu => true,
require => Cobbler_distro["centos63-x86_64"], require => Cobbler_distro["centos-x86_64"],
} }
cobbler_distro { "bootstrap": cobbler_distro { "bootstrap":

2
puppet/nailgun/templates/settings.yaml.erb
View File

@ -52,7 +52,7 @@ MASTER_IP: "<%= ipaddress %>"
COBBLER_URL: "<%= scope.lookupvar('nailgun::cobbler_url') %>" COBBLER_URL: "<%= scope.lookupvar('nailgun::cobbler_url') %>"
COBBLER_USER: "<%= cobbler_user %>" COBBLER_USER: "<%= cobbler_user %>"
COBBLER_PASSWORD: "<%= cobbler_password %>" COBBLER_PASSWORD: "<%= cobbler_password %>"
COBBLER_PROFILE: "centos63-x86_64" COBBLER_PROFILE: "centos-x86_64"
MCO_PSKEY: "<%= mco_pskey %>" MCO_PSKEY: "<%= mco_pskey %>"
MCO_VHOST: "<%= mco_vhost %>" MCO_VHOST: "<%= mco_vhost %>"

74
requirements-rpm.txt
View File

@ -7,44 +7,44 @@ MySQL-server-5.5.28-6
MySQL-server-wsrep-5.5.28_wsrep_23.7-12 MySQL-server-wsrep-5.5.28_wsrep_23.7-12
MySQL-shared-5.5.28-6 MySQL-shared-5.5.28-6
MySQL-shared-wsrep-5.5.28_wsrep_23.7-12 MySQL-shared-wsrep-5.5.28_wsrep_23.7-12
authconfig-6.1.12-10.el6 authconfig-6.1.12-13.el6
autoconf-2.63-5.1.el6 autoconf-2.63-5.1.el6
automake-1.11.1-1.2.el6 automake-1.11.1-4.el6
avahi-0.6.25-11.el6 avahi-0.6.25-12.el6
bind-utils-9.8.2-0.10.rc1.el6_3.6 bind-utils-9.8.2-0.17.rc1.el6_4.4
byacc-1.9.20070509-7.el6 byacc-1.9.20070509-7.el6
centos-release-6-3.el6.centos.9 centos-release-6-4.el6.centos.10
cirros-testvm-0.3.0-3 cirros-testvm-0.3.0-3
cman-3.0.12.1-32.el6_3.2 cman-3.0.12.1-49.el6
cobbler-2.2.3-2.el6 cobbler-2.2.3-2.el6
cobbler-web-2.2.3-2.el6 cobbler-web-2.2.3-2.el6
crmsh-1.2.5-55.2 crmsh-1.2.5-55.2
cronie-1.4.4-7.el6 cronie-1.4.4-7.el6
cronie-noanacron-1.4.4-7.el6 cronie-noanacron-1.4.4-7.el6
crontabs-1.10-33.el6 crontabs-1.10-33.el6
curl-7.19.7-26.el6_2.4 curl-7.19.7-36.el6_4
dhclient-4.1.1-31.0.1.P1.el6.centos.1 dhclient-4.1.1-34.P1.el6.centos
dmidecode-2.11-2.el6 dmidecode-2.11-2.el6
dnsmasq-utils-2.48-6.el6 dnsmasq-utils-2.48-13.el6
euca2ools-2.1.1-2.el6 euca2ools-2.1.1-2.el6
fence-agents-3.1.5-17.1.el6_3 fence-agents-3.1.5-25.el6_4.2
flex-2.5.35-8.el6 flex-2.5.35-8.el6
galera-23.2.2-1.rhel5 galera-23.2.2-1.rhel5
gcc-4.4.6-4.el6 gcc-4.4.7-3.el6
gcc-c++-4.4.6-4.el6 gcc-c++-4.4.7-3.el6
haproxy-1.4.19-1.el6 haproxy-1.4.22-3.el6
keepalived-1.2.4-1.el6 keepalived-1.2.7-3.el6
librelp-0.1.1-4.1.el6 librelp-0.1.1-4.1.el6
make-3.81-20.el6 make-3.81-20.el6
man-1.6f-30.el6 man-1.6f-32.el6
memcached-1.4.4-3.el6 memcached-1.4.4-3.el6
nginx-1.0.15-4.el6 nginx-1.0.15-4.el6
novnc-0.4-8.el6 novnc-0.4-8.el6
ntp-4.2.4p8-2.el6.centos ntp-4.2.4p8-3.el6.centos
numpy-1.4.1-9.el6 numpy-1.4.1-9.el6
openssh-clients-5.3p1-81.el6_3 openssh-clients-5.3p1-84.1.el6
openssh-server-5.3p1-81.el6_3 openssh-server-5.3p1-84.1.el6
openssl-devel-1.0.0-25.el6_3.1 openssl-devel-1.0.0-27.el6_4.2
openssl098e-0.9.8e-17.el6.centos.2 openssl098e-0.9.8e-17.el6.centos.2
openstack-cinder-2012.2.3.fuel2.0-mira.9 openstack-cinder-2012.2.3.fuel2.0-mira.9
openstack-dashboard-2012.2.3.fuel2.0-mira.4 openstack-dashboard-2012.2.3.fuel2.0-mira.4
@ -58,9 +58,9 @@ openstack-swift-container-1.7.4.fuel2.0-mira.7
openstack-swift-object-1.7.4.fuel2.0-mira.7 openstack-swift-object-1.7.4.fuel2.0-mira.7
openstack-swift-proxy-1.7.4.fuel2.0-mira.7 openstack-swift-proxy-1.7.4.fuel2.0-mira.7
openstack-utils-2013.1-1.el6 openstack-utils-2013.1-1.el6
pacemaker-1.1.8-1.el6 pacemaker-1.1.8-7.el6
patch-2.6-6.el6 patch-2.6-6.el6
policycoreutils-2.0.83-19.24.el6 policycoreutils-2.0.83-19.30.el6
postgresql-8.4.13-1.el6_3 postgresql-8.4.13-1.el6_3
postgresql-devel-8.4.13-1.el6_3 postgresql-devel-8.4.13-1.el6_3
postgresql-libs-8.4.13-1.el6_3 postgresql-libs-8.4.13-1.el6_3
@ -72,23 +72,23 @@ puppetdb-terminus-1.0.5-1.el6
python-amqp-1.2.0-6.el6 python-amqp-1.2.0-6.el6
python-argparse-1.2.1-2.el6 python-argparse-1.2.1-2.el6
python-cinder-2012.2.3.fuel2.0-mira.9 python-cinder-2012.2.3.fuel2.0-mira.9
python-devel-2.6.6-29.el6_3.3 python-devel-2.6.6-36.el6
python-keystone-2012.2.3.fuel2.0-mira.5 python-keystone-2012.2.3.fuel2.0-mira.5
python-novaclient-2.10.0.fuel2.0-mira.6 python-novaclient-2.10.0.fuel2.0-mira.6
python-pip-0.8-1.el6 python-pip-0.8-1.el6
python-setuptools-0.6.10-3.el6 python-setuptools-0.6.10-3.el6
python-virtualenv-1.7.2-1.el6 python-virtualenv-1.7.2-1.el6
qemu-img-0.12.1.2-2.295.el6_3.10 qemu-img-0.12.1.2-2.355.0.1.el6.centos.2
qemu-kvm-0.12.1.2-2.295.el6_3.10 qemu-kvm-0.12.1.2-2.355.0.1.el6.centos.2
rabbitmq-server-2.8.7-2.el6 rabbitmq-server-2.8.7-2.el6
rpm-build-4.8.0-27.el6 rpm-build-4.8.0-32.el6
rsyslog-5.8.10-2.el6 rsyslog-5.8.10-6.el6
rsyslog-relp-5.8.10-2.el6 rsyslog-relp-5.8.10-6.el6
ruby-1.8.7.352-7.el6_2 ruby-1.8.7.352-10.el6_4
ruby-augeas-0.4.1-1.el6 ruby-augeas-0.4.1-1.el6
ruby-devel-1.8.7.352-7.el6_2 ruby-devel-1.8.7.352-10.el6_4
ruby-rdoc-1.8.7.352-7.el6_2 ruby-rdoc-1.8.7.352-10.el6_4
ruby-ri-1.8.7.352-7.el6_2 ruby-ri-1.8.7.352-10.el6_4
ruby-shadow-1.4.1-13.el6 ruby-shadow-1.4.1-13.el6
rubygem-mongrel-1.1.5-3.el6 rubygem-mongrel-1.1.5-3.el6
rubygem-rake-0.8.7-2.1.el6 rubygem-rake-0.8.7-2.1.el6
@ -96,7 +96,7 @@ rubygem-stomp-1.2.8-1.el6
rubygems-1.3.7-1.el6 rubygems-1.3.7-1.el6
scapy-2.0.0.10-5.el6 scapy-2.0.0.10-5.el6
screen-4.0.3-16.el6 screen-4.0.3-16.el6
selinux-policy-targeted-3.7.19-154.el6 selinux-policy-targeted-3.7.19-195.el6_4.3
socat-1.7.2.1-1.el6 socat-1.7.2.1-1.el6
supervisor-3.0a12-0.12.el6 supervisor-3.0a12-0.12.el6
syslinux-4.02-8.el6 syslinux-4.02-8.el6
@ -105,8 +105,8 @@ tcpdump-4.0.0-3.20090921gitdf3cb4.2.el6
tftp-server-0.49-7.el6 tftp-server-0.49-7.el6
unzip-6.0-1.el6 unzip-6.0-1.el6
vim-enhanced-7.2.411-1.8.el6 vim-enhanced-7.2.411-1.8.el6
wget-1.12-1.4.el6 wget-1.12-1.8.el6
xfsprogs-3.1.1-7.el6 xfsprogs-3.1.1-10.el6
xinetd-2.3.14-35.el6_3 xinetd-2.3.14-38.el6
yum-3.2.29-30.el6.centos yum-3.2.29-40.el6.centos
zlib-devel-1.2.3-27.el6 zlib-devel-1.2.3-29.el6