Skip to content

Commit c838925

Browse files
authored
Merge pull request #70 from cezarsa/fixgettemplateid
Fix reading template in autoscale vm profile resource
2 parents 9bc01da + 32735b8 commit c838925

30 files changed

+135
-6574
lines changed

cloudstack/resource_cloudstack_autoscale_vm_profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func resourceCloudStackAutoScaleVMProfileRead(d *schema.ResourceData, meta inter
136136
return err
137137
}
138138

139-
template, _, err := cs.Template.GetTemplateByID(p.Templateid, "executable")
139+
template, _, err := cs.Template.GetTemplateByID(p.Templateid, "executable", cloudstack.WithZone(p.Zoneid))
140140
if err != nil {
141141
return err
142142
}

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ require (
77
github.com/hashicorp/hcl v1.0.0 // indirect
88
github.com/hashicorp/terraform v0.12.0
99
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
10-
github.com/xanzy/go-cloudstack v0.0.0-20190908072532-ea9e2fe8176a
10+
github.com/xanzy/go-cloudstack v1.2.1-0.20191112180448-23b392287df6
1111
gopkg.in/ini.v1 v1.40.0 // indirect
1212
)
13+
14+
go 1.13

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4A
359359
github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
360360
github.com/vmihailenco/msgpack v4.0.1+incompatible h1:RMF1enSPeKTlXrXdOcqjFUElywVZjjC6pqse21bKbEU=
361361
github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
362-
github.com/xanzy/go-cloudstack v0.0.0-20190908072532-ea9e2fe8176a h1:IrNhg1D8fz6LRxxQYySD//Ov3W7+OKZgbm6RZuftFxQ=
363-
github.com/xanzy/go-cloudstack v0.0.0-20190908072532-ea9e2fe8176a/go.mod h1:sBh287mCRwCz6zyXHMmw7sSZGPohVpnx+o+OY4M+i3A=
362+
github.com/xanzy/go-cloudstack v1.2.1-0.20191112180448-23b392287df6 h1:GUn7S7EisN/12khN3b5RqT2aHDostOkooApaYfp4g8k=
363+
github.com/xanzy/go-cloudstack v1.2.1-0.20191112180448-23b392287df6/go.mod h1:sBh287mCRwCz6zyXHMmw7sSZGPohVpnx+o+OY4M+i3A=
364364
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
365365
github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
366366
github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=

vendor/github.com/apparentlymart/go-textseg/textseg/make_tables.go

Lines changed: 0 additions & 307 deletions
This file was deleted.

0 commit comments

Comments
 (0)