openstack
/
fuel-library
Code Issues Proposed changes

Remove fuelweb from repos path 

Should be synchronized with appropriate patchsets in fuel-web and
fuel-main.

Change-Id: Ide4d1138fe5f07b1775a434060c531d5273acc9e
Related-Bug: #1377160
This commit is contained in:
Igor Kalnitsky 2014-10-03 16:43:48 +03:00
parent e46e4325ea
commit c75298bff1
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/cobbler/templates/preseed/ubuntu-1204.preseed.erb
View File

@ -40,7 +40,7 @@ d-i base-installer/kernel/image string linux-server
d-i mirror/protocol string http
d-i mirror/country string manual
d-i mirror/http/hostname string @@server@@:8080
d-i mirror/http/directory string /ubuntu/fuelweb/x86_64
d-i mirror/http/directory string /ubuntu/x86_64
d-i mirror/http/proxy string
d-i mirror/suite string precise
@ -142,7 +142,7 @@ echo -e "" /target/etc/apt/sources.list && \
echo -e 'deb $repo_url' >> /target/etc/apt/sources.list && \
#end for
#else
echo 'deb http://@@server@@:8080/ubuntu/fuelweb/x86_64 precise main' > /target/etc/apt/sources.list && \
echo 'deb http://@@server@@:8080/ubuntu/x86_64 precise main' > /target/etc/apt/sources.list && \
#end if
$SNIPPET('ubuntu_authorized_keys')
sed -i -e "/^\s*GSSAPICleanupCredentials yes/d" -e "/^\s*GSSAPIAuthentication yes/d" -e "s/.*PasswordAuthentication\ .*/PasswordAuthentication\ no/g" -e "/UseDNS/d" /target/etc/ssh/sshd_config && \

10
deployment/puppet/nailgun/manifests/cobbler.pp
View File

@ -105,12 +105,12 @@ class nailgun::cobbler(
} ->
cobbler_distro { "centos-x86_64":
kernel => "${repo_root}/centos/fuelweb/x86_64/isolinux/vmlinuz",
initrd => "${repo_root}/centos/fuelweb/x86_64/isolinux/initrd.img",
kernel => "${repo_root}/centos/x86_64/isolinux/vmlinuz",
initrd => "${repo_root}/centos/x86_64/isolinux/initrd.img",
arch => "x86_64",
breed => "redhat",
osversion => "rhel6",
ksmeta => "tree=http://@@server@@:8080/centos/fuelweb/x86_64/",
ksmeta => "tree=http://@@server@@:8080/centos/x86_64/",
require => Class["::cobbler::server"],
}
@ -123,8 +123,8 @@ class nailgun::cobbler(
} ->
cobbler_distro { "ubuntu_1204_x86_64":
kernel => "${repo_root}/ubuntu/fuelweb/x86_64/images/linux",
initrd => "${repo_root}/ubuntu/fuelweb/x86_64/images/initrd.gz",
kernel => "${repo_root}/ubuntu/x86_64/images/linux",
initrd => "${repo_root}/ubuntu/x86_64/images/initrd.gz",
arch => "x86_64",
breed => "ubuntu",
osversion => "precise",

4
deployment/puppet/rpmcache/manifests/init.pp
View File

@ -102,7 +102,7 @@ $sat_base_channels, $sat_openstack_channel, $numtries = 10) {
require => Cobbler_distro["rhel-x86_64"],
} ->
exec {'rebuild-fuel-repo':
command => "/bin/cp -f /var/www/nailgun/centos/fuelweb/x86_64/repodata/comps.xml ${pkgdir}/repodata/comps.xml; /usr/bin/createrepo --simple-md-filenames -g ${pkgdir}/repodata/comps.xml ${pkgdir}",
command => "/bin/cp -f /var/www/nailgun/centos/x86_64/repodata/comps.xml ${pkgdir}/repodata/comps.xml; /usr/bin/createrepo --simple-md-filenames -g ${pkgdir}/repodata/comps.xml ${pkgdir}",
}
file { '/etc/nailgun/req-fuel-rhel.txt':
@ -114,7 +114,7 @@ $sat_base_channels, $sat_openstack_channel, $numtries = 10) {
require => File['/etc/nailgun/']
} ->
exec {'fuel-rpms':
command => "/bin/mkdir -p ${pkgdir}/fuel/Packages; rsync -ra --include-from=/etc/nailgun/req-fuel-rhel.txt /var/www/nailgun/centos/fuelweb/x86_64/Packages/. ${pkgdir}/fuel/Packages/.",
command => "/bin/mkdir -p ${pkgdir}/fuel/Packages; rsync -ra --include-from=/etc/nailgun/req-fuel-rhel.txt /var/www/nailgun/centos/x86_64/Packages/. ${pkgdir}/fuel/Packages/.",
logoutput => true,
before => Exec['rebuild-fuel-repo'],
}