aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-22 02:23:26 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-04-22 02:23:26 +0200
commitc1bc6ac41e9ea98a37c108a87859c1c113bc9964 (patch)
treee2cb7f65d20ba068b4bcbc40b3e9640b251d1eca
parent093f2b7684c86979dfa6f5f36f28689ca9b3e552 (diff)
u/fuel: Bump & rebase for tenant NIC fixHEADmaster
Change-Id: I318b3541add33d50e47f8acba56b7ad58357e105 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch4
m---------upstream/fuel0
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
index a219e4b..f3b4c32 100644
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
@@ -36,7 +36,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
mcp/salt-formulas/armband/nova_libvirt.sls | 7 +
mcp/salt-formulas/armband/qemu_efi.sls | 2 +
mcp/salt-formulas/armband/vgabios.sls | 7 +
- 9 files changed, 226 insertions(+)
+ 9 files changed, 227 insertions(+)
create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
create mode 100644 mcp/salt-formulas/armband/init.sls
create mode 100644 mcp/salt-formulas/armband/nova_config.sls
@@ -83,7 +83,7 @@ index c391cfe6..02a813c9 100755
salt -C 'kvm* or cmp*' state.apply salt
diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
new file mode 100644
-index 00000000..a480a20c
+index 00000000..299148e3
--- /dev/null
+++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
@@ -0,0 +1,165 @@
diff --git a/upstream/fuel b/upstream/fuel
-Subproject aa199b5e96f91111d96f53040be00736cd9309b
+Subproject cfc5988be48d1317244e71fd7919480db18745d