From 93f8d97757dfe37d262a95148ac94f7a2c78a64e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 23 Aug 2017 15:38:06 +0200 Subject: p/fuel: Rebase after authorized_keys fix upstream Change-Id: Id53c2513b52d05a44dffda0fda40f8df259e226b Signed-off-by: Alexandru Avadanii --- ...lasses-baremetal-arm-pod3-config-hardcode.patch | 95 ---------------------- 1 file changed, 95 deletions(-) delete mode 100644 patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch (limited to 'patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch') diff --git a/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch deleted file mode 100644 index 229ea3a0..00000000 --- a/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Alexandru Avadanii -Date: Thu, 10 Aug 2017 18:32:37 +0200 -Subject: [PATCH] classes: baremetal: arm-pod3 config hardcode - -Populate MaaS configuration with node information for arm-pod3. - -FIXME: Read all this info from PDF (Pod Descriptor File) later. - -Signed-off-by: Alexandru Avadanii ---- - .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 40 +++++++++++----------- - 1 file changed, 20 insertions(+), 20 deletions(-) - -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 73215ee..26115fe 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: - 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: -- cgit 1.2.3-korg