openstack/fuel-library
Code Issues Proposed changes

Create auxiliary repo with fuel version

Browse Source 
Fuel 7.0 auxiliary repo should be created
as /etc/yum.repos.d/7.0_auxiliary

This helps with upgrade/rollback process for
Fuel Master.

The configuration for auxiliary repository on
deployed Fuel nodes is unchanged.

Change-Id: Iec2645ddbee6b1b6b9e5c2816707b275542ef51b
Partial-Bug: #1480282
This commit is contained in:
Matthew Mosesohn 2015-08-10 19:29:02 +03:00
parent c4b2b9a1b4
commit eab7b68399
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/nailgun/examples/host-only.pp
View File

@ -30,6 +30,7 @@ class { 'osnailyfacter::atop': }
class { 'nailgun::host': class { 'nailgun::host':
production => $production, production => $production,
fuel_version => $::fuel_version['VERSION']['release'],
cobbler_host => $::fuel_settings['ADMIN_NETWORK']['ipaddress'], cobbler_host => $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
nailgun_group => $nailgun_group, nailgun_group => $nailgun_group,
nailgun_user => $nailgun_user, nailgun_user => $nailgun_user,

1
deployment/puppet/nailgun/examples/host-upgrade.pp
View File

@ -25,6 +25,7 @@ class { 'nailgun::packages': }
class { 'nailgun::host': class { 'nailgun::host':
production => $production, production => $production,
fuel_version => $::fuel_version['VERSION']['release'],
cobbler_host => $::fuel_settings['ADMIN_NETWORK']['ipaddress'], cobbler_host => $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
nailgun_group => $nailgun_group, nailgun_group => $nailgun_group,
nailgun_user => $nailgun_user, nailgun_user => $nailgun_user,

13
deployment/puppet/nailgun/manifests/auxiliaryrepos.pp
View File

@ -1,6 +1,7 @@
class nailgun::auxiliaryrepos( class nailgun::auxiliaryrepos(
$repo_root = '/var/www/nailgun', $fuel_version,
$priority = '15', $repo_root = '/var/www/nailgun',
$priority = '15',
){ ){
$centos_dir = "${repo_root}/centos/auxiliary/" $centos_dir = "${repo_root}/centos/auxiliary/"
@ -16,11 +17,11 @@ class nailgun::auxiliaryrepos(
File[$centos_dir] -> File[$centos_dir] ->
Package['createrepo'] -> Package['createrepo'] ->
Exec["createrepo ${centos_dir}"] -> Exec["createrepo ${centos_dir}"] ->
Yumrepo['auxiliary'] Yumrepo["${fuel_version}_auxiliary"]
yumrepo { 'auxiliary': yumrepo { "${fuel_version}_auxiliary":
name => 'auxiliary', name => "${fuel_version}_auxiliary",
descr => 'auxillary', descr => "${fuel_version}_auxiliary",
baseurl => "file://${centos_dir}", baseurl => "file://${centos_dir}",
gpgcheck => '0', gpgcheck => '0',
priority => $priority, priority => $priority,

4
deployment/puppet/nailgun/manifests/host.pp
View File

@ -1,5 +1,6 @@
class nailgun::host( class nailgun::host(
$production, $production,
$fuel_version,
$cobbler_host = '127.0.0.1', $cobbler_host = '127.0.0.1',
$dns_search = 'domain.tld', $dns_search = 'domain.tld',
$dns_domain = 'domain.tld', $dns_domain = 'domain.tld',
@ -27,7 +28,8 @@ $admin_iface = 'eth0',
} }
class { 'nailgun::auxiliaryrepos': class { 'nailgun::auxiliaryrepos':
repo_root => $repo_root, fuel_version => $fuel_version,
repo_root => $repo_root,
} }
nailgun::sshkeygen { '/root/.ssh/id_rsa': nailgun::sshkeygen { '/root/.ssh/id_rsa':