summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-03-23 15:58:23 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-03-23 15:59:35 +0100
commit572bb5a1ba7bef7df4bb73daca650b066e8c9ef0 (patch)
tree8e8ffb15b9323d3a5a62aa83c1be358686864865 /patches/fuel-library
parent8f772f7e9d9d3e41575e3f7010a1717d3b6894ae (diff)
f-l: Temporary: Revert upstream patches
In order for our patches to still apply, revert latest changes from upstream Fuel@Openstack. Change-Id: Icca323a71669b413d9777df889b2e2b8b884e261 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library')
-rw-r--r--patches/fuel-library/0000-Revert-Fix-building-ironic-bootstrap.patch82
-rw-r--r--patches/fuel-library/0000-Revert-Fix-task-dependencies-for-provision-and-delet.patch60
2 files changed, 142 insertions, 0 deletions
diff --git a/patches/fuel-library/0000-Revert-Fix-building-ironic-bootstrap.patch b/patches/fuel-library/0000-Revert-Fix-building-ironic-bootstrap.patch
new file mode 100644
index 00000000..652bb276
--- /dev/null
+++ b/patches/fuel-library/0000-Revert-Fix-building-ironic-bootstrap.patch
@@ -0,0 +1,82 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 23 Mar 2017 15:57:02 +0100
+Subject: [PATCH] Revert "Fix building ironic bootstrap"
+
+This reverts commit c90b8a2fab0b8deab06d75b93394f32c60963be7.
+---
+ .../manifests/provision/build_image.pp | 34 +++++++++++-----------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp b/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp
+index b40f3e2..02fa0f0 100644
+--- a/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp
++++ b/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp
+@@ -3,9 +3,7 @@ class osnailyfacter::provision::build_image {
+ $data_file = "/var/lib/fuel/configs/${::cluster_id}/provision.yaml"
+ $data = loadyaml($data_file)
+
+- if $data['ironic']['enabled'] == true {
+- # TODO(vsaienko): Use the same system packages for fuel image and ironic bootstrap, but exclude
+- # not needed for ironic like nailgun-agent, etc...
++ if $data['ironic']['enabled'] == 'true' {
+ $ironic_packages = [
+ 'openssh-server',
+ 'ntp',
+@@ -17,7 +15,9 @@ class osnailyfacter::provision::build_image {
+ 'squashfs-tools',
+ 'linux-firmware',
+ 'msmtp-mta',
++ 'hpsa-dkms',
+ 'i40e-dkms',
++ 'linux-firmware-nonfree',
+ 'xz-utils',
+ 'linux-headers-generic',
+ ]
+@@ -29,25 +29,25 @@ class osnailyfacter::provision::build_image {
+ $out_dir = "/var/www/nailgun/bootstrap/ironic/${::cluster_id}/"
+ $out_params = "--output-dir ${out_dir}"
+
+- $ironic_extra_params = "--extra-dir /usr/share/ironic-fa-bootstrap-configs/ --no-compress --no-default-extra-dirs --no-default-packages"
+- $ironic_log_params = '--log-file /var/log/fuel-ironic-bootstrap-image-build.log'
++ $extra_params = "--extra-dir /usr/share/ironic-fa-bootstrap-configs/ --no-compress --no-default-extra-dirs --no-default-packages"
++ $log_params = '--log-file /var/log/fuel-ironic-bootstrap-image-build.log'
+
+ exec { 'generate_image_with_ironic':
+- command => "fuel-bootstrap build ${package_list} ${ssh_params} ${out_params} ${ironic_extra_params} ${ironic_log_params}",
++ command => "fuel-bootstrap build ${package_list} ${ssh_params} ${out_params} ${extra_params} ${log_params}",
+ path => ['/bin', '/usr/bin'],
+- timeout => 1800,
+- unless => "test -e /var/www/nailgun/bootstrap/ironic/${cluster_id}/vmlinuz",
++ unless => "test -e /var/www/nailgun/bootstrap/ironic/${::cluster_id}/vmlinuz",
+ }
+
+- }
+-
+- $build_dir = '--image_build_dir /var/lib/fuel/ibp'
+- $log_params = "--log-file /var/log/fuel-agent-env-${cluster_id}.log"
+- $extra_params = '--data_driver nailgun_build_image'
++ } else {
++ $build_dir = '--image_build_dir /var/lib/fuel/ibp'
++ $log_params = "--log-file /var/log/fuel-agent-env-${::cluster_id}.log"
++ $extra_params = '--data_driver nailgun_build_image'
+
+- exec { 'generate_image_with_fuel':
+- command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --input_data_file ${data_file}",
+- path => ['/bin', '/usr/bin'],
+- timeout => 1800,
++ exec { 'generate_image_with_fuel':
++ command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --input_data_file ${data_file}",
++ path => ['/bin', '/usr/bin'],
++ timeout => 1800,
++ unless => "test -e /var/www/nailgun/bootstrap/ironic/${::cluster_id}/vmlinuz",
++ }
+ }
+ }
diff --git a/patches/fuel-library/0000-Revert-Fix-task-dependencies-for-provision-and-delet.patch b/patches/fuel-library/0000-Revert-Fix-task-dependencies-for-provision-and-delet.patch
new file mode 100644
index 00000000..d692a73a
--- /dev/null
+++ b/patches/fuel-library/0000-Revert-Fix-task-dependencies-for-provision-and-delet.patch
@@ -0,0 +1,60 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 23 Mar 2017 15:54:11 +0100
+Subject: [PATCH] Revert "Fix task dependencies for provision and deletion
+ graphs"
+
+This reverts commit 399611521195d75225a4cbf5613739bec5798fd0.
+---
+ graphs/deletion/tasks.yaml | 4 +---
+ graphs/provision/tasks.yaml | 6 ++----
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/graphs/deletion/tasks.yaml b/graphs/deletion/tasks.yaml
+index a725dda..2fd0188 100644
+--- a/graphs/deletion/tasks.yaml
++++ b/graphs/deletion/tasks.yaml
+@@ -35,10 +35,8 @@
+ type: reboot
+ version: 2.1.0
+ role: ['/.*/']
++ requires: [reconfigure_dhcpd]
+ required_for: [node_erase]
+- cross-depends:
+- - name: reconfigure_dhcpd
+- role: master
+ parameters:
+ timeout: 300
+
+diff --git a/graphs/provision/tasks.yaml b/graphs/provision/tasks.yaml
+index 8a5c45e..1494176 100644
+--- a/graphs/provision/tasks.yaml
++++ b/graphs/provision/tasks.yaml
+@@ -60,10 +60,8 @@
+ type: upload_file
+ version: 2.1.0
+ role: ['/.*/']
++ requires: [provision_master]
+ required_for: [system_provision]
+- cross-depends:
+- - name: provision_master
+- role: master
+ parameters:
+ path: /tmp/provision.json
+ timeout: 180
+@@ -74,7 +72,7 @@
+ type: shell
+ version: 2.1.0
+ role: ['/.*/']
+- requires: [upload_provision_info]
++ requires: [provision_master, upload_provision_info]
+ required_for: [node_reboot]
+ cross-depends:
+ - name: build_deploy_image