diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-17 21:43:21 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-17 22:23:18 +0100 |
| commit | 3dd58f27b33ec53c802809764ff5fa8293dcdd17 (patch) | |
| tree | e0baac9ff9b1f74db053217f73d8a5b4056f98ac /patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | |
| parent | 32bba0e639eaca254e18b5e4d36969f21f9e3d0e (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/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch')
| -rw-r--r-- | patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 85ee6b56..13f31310 100644 --- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -18,7 +18,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- ...-Add-curtin_userdata_arm64_generic_xenial.patch | 35 +++++++++++++++++++++ mcp/patches/patches.list | 1 + - .../baremetal-mcp-pike-common-ha/infra/maas.yml | 36 ++++++++++++++++++++++ + .../cluster/mcp-pike-common-ha/infra/maas.yml | 36 ++++++++++++++++++++++ .../files/curtin_userdata_arm64_generic_xenial | 35 +++++++++++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -66,19 +66,19 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 34d913a..01e3224 100644 +index 703bd05..e7c6456 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ - /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch +@@ -19,3 +19,4 @@ + /usr/share/salt-formulas/env: 0011-routes-Skip-network-restart-on-noifupdown.patch /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 -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml -index 3bf87dc..4954559 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml -@@ -40,6 +40,42 @@ parameters: +diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +index 3dc9998..956ab4b 100644 +--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml ++++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +@@ -41,6 +41,42 @@ parameters: enable_third_party_drivers: true network_discovery: 'enabled' default_min_hwe_kernel: ${_param:hwe_kernel} |