From 8bdc4f87ac1e5a1630b028d33364e92232e991bd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 24 Aug 2017 18:00:25 +0200 Subject: p/fuel: Bring in Opendaylight support Change-Id: I3d3e729447a4d8e79fce486a7fc68f8f72675e3c Signed-off-by: Alexandru Avadanii --- ...07-mcp-config-AArch64-baremetal-Use-arm64-image.patch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch') diff --git a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch index cd959da3..e238250c 100644 --- a/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch +++ b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch @@ -7,8 +7,9 @@ While at it, bump default vCPU number from 2 to 6. Signed-off-by: Alexandru Avadanii --- mcp/config/scenario/baremetal/defaults.yaml | 4 ++-- + mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 2 +- mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mcp/config/scenario/baremetal/defaults.yaml b/mcp/config/scenario/baremetal/defaults.yaml index b841e88..17fbbfc 100644 @@ -23,6 +24,19 @@ index b841e88..17fbbfc 100644 + vcpus: 6 ram: 4096 +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +index 5862ddb..ab14c58 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +@@ -51,7 +51,7 @@ parameters: + address: ${_param:single_address} + netmask: 255.255.255.0 + +- salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 ++ salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img + salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" + linux: + network: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml index e3d47b0..93e2de0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -- cgit 1.2.3-korg