aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-29 14:16:14 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-29 14:21:24 +0400
commit5f4ea4eae484a37d1a41e1f5e235285fafccbbe7 (patch)
treedc4d34f6faa3b4beb303912c0cc603de72c3b58c
parent7fb1944d93e16365acd0792069b1229fc5964670 (diff)
[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 <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml8
m---------mcp/reclass/classes/system0
4 files changed, 21 insertions, 3 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
-Subproject 7b186ff21829b6a0055c08cc681b94bd89aedf1
+Subproject 3cb78359189257d125dbec215ac57ecbf335abc