From 5f4ea4eae484a37d1a41e1f5e235285fafccbbe7 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 29 Aug 2017 14:16:14 +0400 Subject: [baremetal] Return back custom image for vcp nodes Virtual node based on cloud ubuntu image won't register as a minion on salt master. Change-Id: Ia32eae01a5633042189cdebebcba8043cae61503 Signed-off-by: Michael Polenchuk --- .../classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 8 +++++++- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml | 8 +++++++- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 8 +++++++- mcp/reclass/classes/system | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) 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 e67a06d2e..0baebb65e 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 @@ -54,9 +54,15 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 - salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img + salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: + system: + user: + ubuntu: + enabled: true + sudo: true + home: /home/ubuntu network: host: cfg01: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index 1397daf57..8ea676181 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml @@ -54,9 +54,15 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 - salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img + salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: + system: + user: + ubuntu: + enabled: true + sudo: true + home: /home/ubuntu network: host: cfg01: 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 8bf43be16..62f887d1e 100644 --- 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 @@ -54,9 +54,15 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 - salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img + salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: + system: + user: + ubuntu: + enabled: true + sudo: true + home: /home/ubuntu network: host: cfg01: diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 7b186ff21..3cb783591 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 7b186ff21829b6a0055c08cc681b94bd89aedf1d +Subproject commit 3cb78359189257d125dbec215ac57ecbf335abc6 -- cgit 1.2.3-korg