aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-23 14:07:39 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-23 14:07:39 +0200
commitc0149f8884f6004dae2415f6aa9bec9dd131e1be (patch)
tree7fd0d3b77514c7d44530c79ea484b68b0f378b3f
parent0398db7da7ad89cfdecce1e38a6628c906cb24cb (diff)
u/fuel: Bump & rebase for MaaS repo format
Change-Id: I5558c9751554a88f93ebbfd52cdb721b23f93aff Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch18
-rw-r--r--patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch6
-rw-r--r--patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch10
-rw-r--r--patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch8
-rw-r--r--patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch4
m---------upstream/fuel0
6 files changed, 23 insertions, 23 deletions
diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
index e7a94a37..b98bdc95 100644
--- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -24,15 +24,15 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/config/states/openstack_ha | 1 +
- mcp/config/states/openstack_noha | 2 ++
- mcp/config/states/virtual_control_plane | 1 +
- .../armband/files/nova-libvirt-aarch64-rollup.diff | 27 +++++++++++++++++
- mcp/salt-formulas/armband/init.sls | 7 +++++
- mcp/salt-formulas/armband/nova_config.sls | 35 ++++++++++++++++++++++
- mcp/salt-formulas/armband/nova_libvirt.sls | 7 +++++
- mcp/salt-formulas/armband/qemu_efi.sls | 2 ++
- mcp/salt-formulas/armband/vgabios.sls | 7 +++++
+ mcp/config/states/openstack_ha | 1 +
+ mcp/config/states/openstack_noha | 2 ++
+ mcp/config/states/virtual_control_plane | 1 +
+ .../files/nova-libvirt-aarch64-rollup.diff | 27 ++++++++++++++
+ mcp/salt-formulas/armband/init.sls | 7 ++++
+ mcp/salt-formulas/armband/nova_config.sls | 35 +++++++++++++++++++
+ 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, 89 insertions(+)
create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
create mode 100644 mcp/salt-formulas/armband/init.sls
diff --git a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 82f7851f..086cfcab 100644
--- a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -33,9 +33,9 @@ to pick up the changes, so we'll run it before rebooting kvm nodes.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- mcp/config/states/baremetal_init | 1 +
- .../armband/files/salt-minion-aarch64-rollup.diff | 101 +++++++++++++++++++++
- mcp/salt-formulas/armband/salt_minion.sls | 7 ++
+ mcp/config/states/baremetal_init | 1 +
+ .../files/salt-minion-aarch64-rollup.diff | 101 ++++++++++++++++++
+ mcp/salt-formulas/armband/salt_minion.sls | 7 ++
3 files changed, 109 insertions(+)
create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff
create mode 100644 mcp/salt-formulas/armband/salt_minion.sls
diff --git a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
index be0d9dff..8480a662 100644
--- a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -23,11 +23,11 @@ specific values.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++
- ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++
- mcp/patches/patches.list | 2 +
- .../classes/cluster/mcp-common-ha/infra/kvm.yml | 15 ++++++
- .../classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 | 3 ++
+ ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++
+ ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++
+ mcp/patches/patches.list | 2 +
+ .../cluster/mcp-common-ha/infra/kvm.yml | 15 ++++++
+ .../cluster/mcp-odl-ha/infra/kvm.yml.j2 | 3 ++
5 files changed, 125 insertions(+)
create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch
create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
index e81af01a..f158ed40 100644
--- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch
@@ -14,10 +14,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
---
- mcp/config/states/baremetal_init | 1 +
- mcp/config/states/virtual_control_plane | 1 +
- mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 | 3 +++
- mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++
+ mcp/config/states/baremetal_init | 1 +
+ mcp/config/states/virtual_control_plane | 1 +
+ .../classes/cluster/all-mcp-arch-common/init.yml.j2 | 3 +++
+ mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++
4 files changed, 12 insertions(+)
create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
diff --git a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
index 01aa5b0a..0cfae945 100644
--- a/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0005-Set-volume-name-in-source-file-to-sdX.patch
@@ -12,8 +12,8 @@ Subject: [PATCH] Set volume name in source file to sdX
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
---
- mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +-
- mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml | 2 +-
+ .../classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 +-
+ .../classes/cluster/mcp-common-noha/openstack_control.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
diff --git a/upstream/fuel b/upstream/fuel
-Subproject b03bc918a67f86d6a89441739f4a2952993c9e6
+Subproject e5d54bfdddc6b501e74a7d13be19e69724e20ad