Code Review / armband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[salt] Retire Armband Saltstack repos
[armband.git] / patches / opnfv-fuel / 0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
similarity index 93%
rename from patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
rename to patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
index bb8a947..09dda59 100644 (file)
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0006-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 +
- .../cluster/mcp-pike-common-ha/infra/kvm.yml       | 15 ++++++
- .../cluster/mcp-pike-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-pike-common-ha/infra/kvm.yml  | 15 ++++++
+ .../cluster/mcp-pike-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
@@ -150,20 +150,20 @@ index 00000000..78eb0bff
 +
 + #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
 diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 3632a92b..5bbacf56 100644
+index ce59395c..39e737d6 100644
 --- a/mcp/patches/patches.list
 +++ b/mcp/patches/patches.list
-@@ -18,3 +18,5 @@
+@@ -16,3 +16,5 @@
+ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
  /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
  /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
- /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
 +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
 +/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-index 5bbe0fe4..84b392e6 100644
+index df230452..3548155f 100644
 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-@@ -53,21 +53,33 @@ parameters:
+@@ -52,21 +52,33 @@ parameters:
          openstack.control:
            cpu: 4
            ram: 12288
@@ -197,7 +197,7 @@ index 5bbe0fe4..84b392e6 100644
            disk_profile: xxlarge
            net_profile: default
          # stacklight.log:
-@@ -88,6 +100,9 @@ parameters:
+@@ -87,6 +99,9 @@ parameters:
          openstack.proxy:
            cpu: 2
            ram: 2048