diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-28 05:27:48 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-28 03:30:16 +0000 |
| commit | c7a7d5b4ea00f043d17c13248cb3aa5f37f2058e (patch) | |
| tree | 19726507d92b11465043479722c416c1ee3162e7 /patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch | |
| parent | 3b19e08d3e10519efee7f3c9d40a740318f762dc (diff) | |
u/fuel: Bump & rebase for MaaS missing inc fixup
Change-Id: I041d51eeebfe77aee9a519584f6cfb6f7b740e93
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit a6f17c731f081664fa8c62389669b56b5e8b7c2e)
Diffstat (limited to 'patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch')
| -rw-r--r-- | patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index 8fc33614..f331bf84 100644 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -120,10 +120,10 @@ index da26254..5e4ea66 100644 - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -index cbb1caf..e54621c 100644 +index 0900b65..a8c6d81 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -@@ -5,9 +5,9 @@ classes: +@@ -6,9 +6,9 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: @@ -403,10 +403,10 @@ index 9e023e3..95bacb2 100644 - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -index 2922fa3..99ca6ce 100644 +index bf57837..86b2f94 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -@@ -5,9 +5,9 @@ classes: +@@ -6,9 +6,9 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: |