Fix: f-l: s/nailgun::/fuel::/cobbler::preseed. 23/15123/2
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 8 Jun 2016 15:26:12 +0000 (17:26 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 8 Jun 2016 15:27:00 +0000 (17:27 +0200)
The nailgun puppet module has been replaced with fuel puppet module.
This change needs to be reflected in our cobbler preseed function,
which I missed during the initial rebase.

[1] https://github.com/openstack/fuel-library/commit/
    74a68f493ff215ce8dfc67c3af6d06dd5a2db194

Change-Id: Ie13861ff75fc289ab03190f48fcfb5579499db1e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch

index 5d52e15..244dede 100644 (file)
@@ -182,7 +182,7 @@ index a11498c..95a9497 100644
 -    group   => 'root',
 -    mode    => '0644',
 -    require => Class['::cobbler::server'],
-+  nailgun::cobbler::preseed { 'ubuntu_1404_x86_64.preseed':
++  fuel::cobbler::preseed { 'ubuntu_1404_x86_64.preseed':
 +    path =>'/var/lib/cobbler/kickstarts/ubuntu-amd64.preseed',
 +    arch => "amd64",
    } ->
@@ -192,7 +192,7 @@ index a11498c..95a9497 100644
      require   => Class['::cobbler::server'],
    }
 
-+  nailgun::cobbler::preseed { 'ubuntu_1404_arm64.preseed':
++  fuel::cobbler::preseed { 'ubuntu_1404_arm64.preseed':
 +    path => '/var/lib/cobbler/kickstarts/ubuntu-arm64.preseed',
 +    arch => "arm64",
 +  } ->
@@ -242,7 +242,7 @@ index 0000000..93c71ba
 --- /dev/null
 +++ b/deployment/puppet/fuel/manifests/cobbler/preseed.pp
 @@ -0,0 +1,13 @@
-+define nailgun::cobbler::preseed(
++define fuel::cobbler::preseed(
 +  $path,
 +  $arch = "amd64",
 +) {