aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-08 17:26:12 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-08 17:27:00 +0200
commitfa5e6763158c22740824bbdf48b1fb9eaa9eea03 (patch)
tree35b7d83b3939c7622ed9319832a404912d7f94b9
parentd99a4e66f3352517c9c99cdef9968ce546e121a3 (diff)
Fix: f-l: s/nailgun::/fuel::/cobbler::preseed.
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>
-rw-r--r--patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch b/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
index 5d52e155..244dedee 100644
--- a/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
+++ b/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
@@ -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",
+) {