summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 19:04:32 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 12:00:25 +0000
commit85c96cb879081b3b13a6d53c50866637d09f9f42 (patch)
tree3e6c0f3a588c163d69e90d4f8a4e7ef028a83865
parent8bceae7e5888f9b97bc16239a653135094fc985b (diff)
Rebase: p/fuel-library: nailgun -> fuel module.
Upstream introduced two related changes, requiring a rebase: - Remove nailgun module [1] - Remove CentOS based bootstrap image support [2] [1] https://github.com/openstack/fuel-library/commit/ 74a68f493ff215ce8dfc67c3af6d06dd5a2db194 [2] https://github.com/openstack/fuel-library/commit/ 3e1320bfcf4a8688d4bfb577a1330121390bafc0 Change-Id: I27279a2fd76d269d482a3eb25e9dba41bc669280
-rw-r--r--patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch143
-rw-r--r--patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch16
2 files changed, 75 insertions, 84 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 d8a6a03d..5d52e155 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
@@ -12,14 +12,14 @@ Add arm64 templates to cobbler and nailgun
.../cobbler/templates/grubprofile.template.erb | 12 +++++++
.../cobbler/templates/grubsystem.template.erb | 16 +++++++++
.../templates/preseed/ubuntu-1404.preseed.erb | 2 ++
- .../puppet/nailgun/manifests/auxiliaryrepos.pp | 12 ++++---
- deployment/puppet/nailgun/manifests/cobbler.pp | 38 +++++++++++++++++-----
- .../puppet/nailgun/manifests/cobbler/preseed.pp | 13 ++++++++
+ .../puppet/fuel/manifests/auxiliaryrepos.pp | 12 ++++---
+ deployment/puppet/fuel/manifests/cobbler.pp | 38 +++++++++++++++++-----
+ .../puppet/fuel/manifests/cobbler/preseed.pp | 13 ++++++++
9 files changed, 115 insertions(+), 12 deletions(-)
create mode 100644 deployment/puppet/cobbler/templates/efidefault.template.erb
create mode 100644 deployment/puppet/cobbler/templates/grubprofile.template.erb
create mode 100644 deployment/puppet/cobbler/templates/grubsystem.template.erb
- create mode 100644 deployment/puppet/nailgun/manifests/cobbler/preseed.pp
+ create mode 100644 deployment/puppet/fuel/manifests/cobbler/preseed.pp
diff --git a/deployment/puppet/cobbler/manifests/server.pp b/deployment/puppet/cobbler/manifests/server.pp
index bdb1ae7..0523404 100644
@@ -138,17 +138,17 @@ index fd6dda3..65c6c69 100644
# You can choose to install restricted and universe software, or to install
# software from the backports repository.
-diff --git a/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp b/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp
+diff --git a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp
index 41a2570..720943d 100644
---- a/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp
-+++ b/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp
+--- a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp
++++ b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp
@@ -48,17 +48,21 @@ class nailgun::auxiliaryrepos(
exec { 'create_ubuntu_repo_dirs':
path => '/bin:/sbin:/usr/bin:/usr/sbin',
- command => "bash -c \"mkdir -p ${ubuntu_dir}/pool/{main,restricted} ${ubuntu_dir}/dists/auxiliary/{main,restricted}/binary-amd64/\"",
+ command => "bash -c \"mkdir -p ${ubuntu_dir}/pool/{main,restricted} ${ubuntu_dir}/dists/auxiliary/{main,restricted}/binary-{amd64,arm64}/\"",
- unless => "test -d ${ubuntu_dir}/pool && \
+ unless => "test -d ${ubuntu_dir}/pool && \
test -d ${ubuntu_dir}/dists/auxiliary/main/binary-amd64 && \
- test -d ${ubuntu_dir}/dists/auxiliary/restricted/binary-amd64",
+ test -d ${ubuntu_dir}/dists/auxiliary/restricted/binary-amd64 && \
@@ -168,88 +168,79 @@ index 41a2570..720943d 100644
}
file { $release_files:
-diff --git a/deployment/puppet/nailgun/manifests/cobbler.pp b/deployment/puppet/nailgun/manifests/cobbler.pp
+diff --git a/deployment/puppet/fuel/manifests/cobbler.pp b/deployment/puppet/fuel/manifests/cobbler.pp
index a11498c..95a9497 100644
---- a/deployment/puppet/nailgun/manifests/cobbler.pp
-+++ b/deployment/puppet/nailgun/manifests/cobbler.pp
-@@ -43,7 +43,7 @@ class nailgun::cobbler(
- $bootstrap_profile = $bootstrap_flavor ? {
- /(?i)centos/ => 'bootstrap',
- /(?i)ubuntu/ => 'ubuntu_bootstrap',
-- default => 'bootstrap',
-+ default => 'ubuntu_bootstrap',
- }
-
- if $::osfamily == 'RedHat' {
+--- a/deployment/puppet/fuel/manifests/cobbler.pp
++++ b/deployment/puppet/fuel/manifests/cobbler.pp
@@ -133,12 +133,9 @@ class nailgun::cobbler(
- require => Class['::cobbler::server'],
- }
+ require => Class['::cobbler::server'],
+ }
-- file { '/var/lib/cobbler/kickstarts/ubuntu-amd64.preseed':
-- content => template('cobbler/preseed/ubuntu-1404.preseed.erb'),
-- owner => 'root',
-- group => 'root',
-- mode => '0644',
-- require => Class['::cobbler::server'],
-+ nailgun::cobbler::preseed { 'ubuntu_1404_x86_64.preseed':
-+ path =>'/var/lib/cobbler/kickstarts/ubuntu-amd64.preseed',
-+ arch => "amd64",
- } ->
+- file { '/var/lib/cobbler/kickstarts/ubuntu-amd64.preseed':
+- content => template('cobbler/preseed/ubuntu-1404.preseed.erb'),
+- owner => 'root',
+- group => 'root',
+- mode => '0644',
+- require => Class['::cobbler::server'],
++ nailgun::cobbler::preseed { 'ubuntu_1404_x86_64.preseed':
++ path =>'/var/lib/cobbler/kickstarts/ubuntu-amd64.preseed',
++ arch => "amd64",
+ } ->
- cobbler_distro { 'ubuntu_1404_x86_64':
+ cobbler_distro { 'ubuntu_1404_x86_64':
@@ -151,6 +148,21 @@ class nailgun::cobbler(
- require => Class['::cobbler::server'],
- }
-
-+ nailgun::cobbler::preseed { 'ubuntu_1404_arm64.preseed':
-+ path => '/var/lib/cobbler/kickstarts/ubuntu-arm64.preseed',
-+ arch => "arm64",
-+ } ->
+ require => Class['::cobbler::server'],
+ }
+
++ nailgun::cobbler::preseed { 'ubuntu_1404_arm64.preseed':
++ path => '/var/lib/cobbler/kickstarts/ubuntu-arm64.preseed',
++ arch => "arm64",
++ } ->
+
-+ cobbler_distro { 'ubuntu_1404_arm64':
-+ kernel => "${repo_root}/ubuntu/x86_64/images/linux",
-+ initrd => "${repo_root}/ubuntu/x86_64/images/initrd.gz",
-+ arch => 'x86_64', # Makes Cobbler choose PXE
-+ breed => 'ubuntu',
-+ osversion => 'trusty',
-+ ksmeta => '',
-+ require => Class['::cobbler::server'],
-+ }
++ cobbler_distro { 'ubuntu_1404_arm64':
++ kernel => "${repo_root}/ubuntu/x86_64/images/linux",
++ initrd => "${repo_root}/ubuntu/x86_64/images/initrd.gz",
++ arch => 'x86_64', # Makes Cobbler choose PXE
++ breed => 'ubuntu',
++ osversion => 'trusty',
++ ksmeta => '',
++ require => Class['::cobbler::server'],
++ }
+
- cobbler_profile { 'centos-x86_64':
- kickstart => '/var/lib/cobbler/kickstarts/centos-x86_64.ks',
- kopts => 'biosdevname=0 sshd=1 dhcptimeout=120',
+ cobbler_profile { 'centos-x86_64':
+ kickstart => '/var/lib/cobbler/kickstarts/centos-x86_64.ks',
+ kopts => 'biosdevname=0 sshd=1 dhcptimeout=120',
@@ -171,6 +183,16 @@ class nailgun::cobbler(
- require => Cobbler_distro['ubuntu_1404_x86_64'],
- }
+ require => Cobbler_distro['ubuntu_1404_x86_64'],
+ }
-+ cobbler_profile { 'ubuntu_1404_arm64':
-+ kickstart => '/var/lib/cobbler/kickstarts/ubuntu-arm64.preseed',
-+ kopts => 'console=ttyAMA0,115200 console=ttyS0,115200 net.ifnames=0 biosdevname=0 netcfg/choose_interface=eth0 netcfg/dhcp_timeout=120 netcfg/link_detection_timeout=20',
-+ distro => 'ubuntu_1404_arm64',
-+ ksmeta => '',
-+ menu => false,
-+ server => $real_server,
-+ require => Cobbler_distro['ubuntu_1404_arm64'],
-+ }
++ cobbler_profile { 'ubuntu_1404_arm64':
++ kickstart => '/var/lib/cobbler/kickstarts/ubuntu-arm64.preseed',
++ kopts => 'console=ttyAMA0,115200 console=ttyS0,115200 net.ifnames=0 biosdevname=0 netcfg/choose_interface=eth0 netcfg/dhcp_timeout=120 netcfg/link_detection_timeout=20',
++ distro => 'ubuntu_1404_arm64',
++ ksmeta => '',
++ menu => false,
++ server => $real_server,
++ require => Cobbler_distro['ubuntu_1404_arm64'],
++ }
+
- cobbler_distro { 'bootstrap':
- kernel => "${repo_root}/bootstrap/linux",
- initrd => "${repo_root}/bootstrap/initramfs.img",
+ cobbler_distro { 'ubuntu_bootstrap':
+ kernel => "${bootstrap_path}/vmlinuz",
+ initrd => "${bootstrap_path}/initrd.img",
@@ -205,7 +227,7 @@ class nailgun::cobbler(
- distro => 'ubuntu_bootstrap',
- menu => true,
- kickstart => '',
-- kopts => extend_kopts($bootstrap_meta['extend_kopts'], "console=ttyS0,9600 console=tty0 panic=60 ethdevice-timeout=${bootstrap_ethdevice_timeout} boot=live toram components fetch=http://${server}:8080/bootstraps/active_bootstrap/root.squashfs biosdevname=0 url=${nailgun_api_url} mco_user=${mco_user} mco_pass=${mco_pass}"),
-+ kopts => extend_kopts($bootstrap_meta['extend_kopts'], "console=ttyAMA0,115200 console=ttyS0,115200 panic=60 ethdevice-timeout=${bootstrap_ethdevice_timeout} boot=live toram components fetch=http://${server}:8080/bootstraps/active_bootstrap/root.squashfs biosdevname=0 url=${nailgun_api_url} mco_user=${mco_user} mco_pass=${mco_pass}"),
- ksmeta => '',
- server => $real_server,
- require => Cobbler_distro['ubuntu_bootstrap'],
-diff --git a/deployment/puppet/nailgun/manifests/cobbler/preseed.pp b/deployment/puppet/nailgun/manifests/cobbler/preseed.pp
+ distro => 'ubuntu_bootstrap',
+ menu => true,
+ kickstart => '',
+- kopts => extend_kopts($bootstrap_meta['extend_kopts'], "console=ttyS0,9600 console=tty0 panic=60 ethdevice-timeout=${bootstrap_ethdevice_timeout} boot=live toram components fetch=http://${server}:8080/bootstraps/active_bootstrap/root.squashfs biosdevname=0 url=${nailgun_api_url} mco_user=${mco_user} mco_pass=${mco_pass} ip=frommedia"),
++ kopts => extend_kopts($bootstrap_meta['extend_kopts'], "console=ttyAMA0,115200 console=ttyS0,115200 panic=60 ethdevice-timeout=${bootstrap_ethdevice_timeout} boot=live toram components fetch=http://${server}:8080/bootstraps/active_bootstrap/root.squashfs biosdevname=0 url=${nailgun_api_url} mco_user=${mco_user} mco_pass=${mco_pass} ip=frommedia"),
+ ksmeta => '',
+ server => $real_server,
+ require => Cobbler_distro['ubuntu_bootstrap'],
+diff --git a/deployment/puppet/fuel/manifests/cobbler/preseed.pp b/deployment/puppet/fuel/manifests/cobbler/preseed.pp
new file mode 100644
index 0000000..93c71ba
--- /dev/null
-+++ b/deployment/puppet/nailgun/manifests/cobbler/preseed.pp
++++ b/deployment/puppet/fuel/manifests/cobbler/preseed.pp
@@ -0,0 +1,13 @@
+define nailgun::cobbler::preseed(
+ $path,
diff --git a/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch b/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch
index 591d3968..2edabc66 100644
--- a/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch
+++ b/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch
@@ -3,14 +3,14 @@ Date: Wed, 24 Feb 2016 20:05:25 +0100
Subject: [PATCH] Add arm64 for auxiliary repos
---
- deployment/puppet/nailgun/files/Release-auxiliary | 2 +-
- deployment/puppet/nailgun/manifests/auxiliaryrepos.pp | 4 +++-
+ deployment/puppet/fuel/files/Release-auxiliary | 2 +-
+ deployment/puppet/fuel/manifests/auxiliaryrepos.pp | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
-diff --git a/deployment/puppet/nailgun/files/Release-auxiliary b/deployment/puppet/nailgun/files/Release-auxiliary
+diff --git a/deployment/puppet/fuel/files/Release-auxiliary b/deployment/puppet/fuel/files/Release-auxiliary
index 2d5ce58..03f84b8 100644
---- a/deployment/puppet/nailgun/files/Release-auxiliary
-+++ b/deployment/puppet/nailgun/files/Release-auxiliary
+--- a/deployment/puppet/fuel/files/Release-auxiliary
++++ b/deployment/puppet/fuel/files/Release-auxiliary
@@ -3,6 +3,6 @@ Label: auxiliary
Suite: auxiliary
Codename: auxiliary
@@ -19,10 +19,10 @@ index 2d5ce58..03f84b8 100644
+Architectures: amd64 arm64
Components: main restricted
Description: Auxiliary
-diff --git a/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp b/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp
+diff --git a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp
index 720943d..91adb3e 100644
---- a/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp
-+++ b/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp
+--- a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp
++++ b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp
@@ -40,7 +40,9 @@ class nailgun::auxiliaryrepos(
$release_files = [
"${ubuntu_dir}/dists/auxiliary/Release",