diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-05 00:30:14 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-05 23:41:37 +0100 |
| commit | 0bc1111a2d7dba9593d0a00804dba41d37b15481 (patch) | |
| tree | 7d3b9def338593bf516aeaca38217fb0c0994e5b /patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch | |
| parent | 0e8a4fc5a553bb55c22590c0620ebfd770394e96 (diff) | |
u/fuel: Bump & rebase for MaaS prx et al
Change-Id: Ib2fa3af6c1336ad31868a812abe2b8257f69895c
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.patch | 18 |
1 files changed, 9 insertions, 9 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 c4c81627..75a7ed33 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,7 +26,7 @@ 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-ocata-common/infra/kvm.yml | 15 ++++++ + .../baremetal-mcp-ocata-common-ha/infra/kvm.yml | 15 ++++++ .../baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 3 ++ 5 files changed, 125 insertions(+) create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch @@ -150,7 +150,7 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 36e7f73..b7c1607 100644 +index a1741d2..e7660ba 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -18,3 +18,5 @@ @@ -159,11 +159,11 @@ index 36e7f73..b7c1607 100644 /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.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-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -index ce7fc85..5e8d861 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -@@ -48,21 +48,33 @@ parameters: +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml +index 9f6c1ea..1215d92 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml +@@ -46,21 +46,33 @@ parameters: openstack.control: cpu: 4 ram: 12288 @@ -197,7 +197,7 @@ index ce7fc85..5e8d861 100644 disk_profile: xxlarge net_profile: default # stacklight.log: -@@ -83,6 +95,9 @@ parameters: +@@ -81,6 +93,9 @@ parameters: openstack.proxy: cpu: 2 ram: 2048 @@ -208,7 +208,7 @@ index ce7fc85..5e8d861 100644 net_profile: default_ext cluster: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -index d7bbadd..f8b9662 100644 +index 400cba9..8eb29e8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -17,6 +17,9 @@ parameters: |