summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-17 21:43:21 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-17 22:23:18 +0100
commit3dd58f27b33ec53c802809764ff5fa8293dcdd17 (patch)
treee0baac9ff9b1f74db053217f73d8a5b4056f98ac /patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
parent32bba0e639eaca254e18b5e4d36969f21f9e3d0e (diff)
u/fuel: Bump & rebase for virtual PDF support
Finally drop hardcoded IP addresses for virtual deploys from reclass, but keep one small patch adjusting the local vPDF to achieve the same goal. JIRA: FUEL-322 Change-Id: I56a3b0487f564355a4c51b4eb71ec97e92531f1d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch')
-rw-r--r--patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
index d28cb61b..927ff0e0 100644
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -26,8 +26,8 @@ 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 +
- .../baremetal-mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
- .../baremetal-mcp-pike-odl-ha/infra/kvm.yml | 3 ++
+ .../cluster/mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
+ .../classes/cluster/mcp-pike-odl-ha/infra/kvm.yml | 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 0000000..78eb0bf
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 01e3224..e17a329 100644
+index e7c6456..f68cf70 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -19,3 +19,5 @@
+@@ -20,3 +20,5 @@
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
/usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.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/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-index a604d0a..166b368 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml
-@@ -50,21 +50,33 @@ parameters:
+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 3a6eb84..382b7a2 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
+@@ -52,21 +52,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -197,7 +197,7 @@ index a604d0a..166b368 100644
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -85,6 +97,9 @@ parameters:
+@@ -87,6 +99,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048
@@ -207,10 +207,10 @@ index a604d0a..166b368 100644
disk_profile: small
net_profile: default_ext
cluster:
-diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
-index bbc80e2..8efebc7 100644
---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml
+diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
+index 536963c..8c61538 100644
+--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
++++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
@@ -17,6 +17,9 @@ parameters:
opendaylight.server:
cpu: 4