Deprecate ssh_keys argument to decort_kvmvm, as it is replaced by cloud_init
This commit is contained in:
@@ -75,12 +75,14 @@ func resourceComputeCreate(d *schema.ResourceData, m interface{}) error {
|
|||||||
urlValues.Add("desc", argVal.(string))
|
urlValues.Add("desc", argVal.(string))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
sshKeysVal, sshKeysSet := d.GetOk("ssh_keys")
|
sshKeysVal, sshKeysSet := d.GetOk("ssh_keys")
|
||||||
if sshKeysSet {
|
if sshKeysSet {
|
||||||
// process SSH Key settings and set API values accordingly
|
// process SSH Key settings and set API values accordingly
|
||||||
log.Debugf("resourceComputeCreate: calling makeSshKeysArgString to setup SSH keys for guest login(s)")
|
log.Debugf("resourceComputeCreate: calling makeSshKeysArgString to setup SSH keys for guest login(s)")
|
||||||
urlValues.Add("userdata", makeSshKeysArgString(sshKeysVal.([]interface{})))
|
urlValues.Add("userdata", makeSshKeysArgString(sshKeysVal.([]interface{})))
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
computeCreateAPI := KvmX86CreateAPI
|
computeCreateAPI := KvmX86CreateAPI
|
||||||
arch := d.Get("arch").(string)
|
arch := d.Get("arch").(string)
|
||||||
@@ -114,9 +116,11 @@ func resourceComputeCreate(d *schema.ResourceData, m interface{}) error {
|
|||||||
d.SetPartial("ram")
|
d.SetPartial("ram")
|
||||||
d.SetPartial("image_id")
|
d.SetPartial("image_id")
|
||||||
d.SetPartial("boot_disk_size")
|
d.SetPartial("boot_disk_size")
|
||||||
|
/*
|
||||||
if sshKeysSet {
|
if sshKeysSet {
|
||||||
d.SetPartial("ssh_keys")
|
d.SetPartial("ssh_keys")
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
log.Debugf("resourceComputeCreate: new simple Compute ID %d, name %s created", compId, d.Get("name").(string))
|
log.Debugf("resourceComputeCreate: new simple Compute ID %d, name %s created", compId, d.Get("name").(string))
|
||||||
|
|
||||||
@@ -451,6 +455,7 @@ func resourceCompute() *schema.Resource {
|
|||||||
Description: "Optional network connection(s) for this compute. You may specify several network blocks, one for each connection.",
|
Description: "Optional network connection(s) for this compute. You may specify several network blocks, one for each connection.",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/*
|
||||||
"ssh_keys": {
|
"ssh_keys": {
|
||||||
Type: schema.TypeList,
|
Type: schema.TypeList,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
@@ -460,6 +465,7 @@ func resourceCompute() *schema.Resource {
|
|||||||
},
|
},
|
||||||
Description: "SSH keys to authorize on this compute instance.",
|
Description: "SSH keys to authorize on this compute instance.",
|
||||||
},
|
},
|
||||||
|
*/
|
||||||
|
|
||||||
"description": {
|
"description": {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
|
|||||||
Reference in New Issue
Block a user