diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-19 16:36:43 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-23 22:23:54 +0000 |
| commit | 0328802297f0f8aa4111c4a6f35bf2d1be783ede (patch) | |
| tree | 83e2b0f113f68f8234076b415b3849228a9a73a4 /patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch | |
| parent | 80f273c2429dbeec6a3f03d45e7033e02822593e (diff) | |
u/fuel: Bump & rebase for PDF-compatible reclass
JIRA: ARMBAND-292
Change-Id: I913ac6ec20cd34573c0e91989d7fd49a79abafaa
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 397cd1932fae59622f3cc2d782faf68b803f4860)
Diffstat (limited to 'patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch')
| -rw-r--r-- | patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch | 89 |
1 files changed, 3 insertions, 86 deletions
diff --git a/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch index ac3d1356..f915929f 100644 --- a/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch +++ b/patches/opnfv-fuel/0007-classes-baremetal-arm-pod3-config-hardcode.patch @@ -17,96 +17,13 @@ FIXME: Read all this info from PDF (Pod Descriptor File) later. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- .../baremetal-mcp-ocata-odl-ha/infra/maas.yml | 40 +++++++++++----------- - .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 40 +++++++++++----------- - 2 files changed, 40 insertions(+), 40 deletions(-) + 1 file changed, 20 insertions(+), 20 deletions(-) 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 08a3b48..3568c78 100644 +index 40d9c2d..b6735fc 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 -@@ -48,57 +48,57 @@ parameters: - machines: - kvm01: - interface: -- mac: "00:25:b5:a0:00:2a" -+ mac: "e0:ff:f7:00:08:ae" - power_parameters: -- power_address: "172.30.8.75" -- power_password: "octopus" -+ power_address: "10.0.8.3" -+ power_password: "admin" - power_type: ipmi - power_user: "admin" -- architecture: 'amd64/generic' -+ architecture: 'arm64/generic' - distro_series: xenial - hwe_kernel: hwe-16.04 - kvm02: - interface: -- mac: "00:25:b5:a0:00:3a" -+ mac: "e0:ff:f7:00:08:b1" - power_parameters: -- power_address: "172.30.8.65" -- power_password: "octopus" -+ power_address: "10.0.8.4" -+ power_password: "admin" - power_type: ipmi - power_user: "admin" -- architecture: 'amd64/generic' -+ architecture: 'arm64/generic' - distro_series: xenial - hwe_kernel: hwe-16.04 - kvm03: - interface: -- mac: "00:25:b5:a0:00:4a" -+ mac: "e0:ff:f7:00:08:bd" - power_parameters: -- power_address: "172.30.8.74" -- power_password: "octopus" -+ power_address: "10.0.8.5" -+ power_password: "admin" - power_type: ipmi - power_user: "admin" -- architecture: 'amd64/generic' -+ architecture: 'arm64/generic' - distro_series: xenial - hwe_kernel: hwe-16.04 - cmp001: - interface: -- mac: "00:25:b5:a0:00:5a" -+ mac: "e0:ff:f7:00:08:c6" - power_parameters: -- power_address: "172.30.8.73" -- power_password: "octopus" -+ power_address: "10.0.8.6" -+ power_password: "admin" - power_type: ipmi - power_user: "admin" -- architecture: 'amd64/generic' -+ architecture: 'arm64/generic' - distro_series: xenial - hwe_kernel: hwe-16.04 - cmp002: - interface: -- mac: "00:25:b5:a0:00:6a" -+ mac: "e0:ff:f7:00:08:cf" - power_parameters: -- power_address: "172.30.8.72" -- power_password: "octopus" -+ power_address: "10.0.8.7" -+ power_password: "admin" - power_type: ipmi - power_user: "admin" -- architecture: 'amd64/generic' -+ architecture: 'arm64/generic' - distro_series: xenial - hwe_kernel: hwe-16.04 - linux: -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 37e8377..d71b3a6 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 -@@ -48,57 +48,57 @@ parameters: +@@ -47,57 +47,57 @@ parameters: machines: kvm01: interface: |