added support for gophercloud's PopulateApi
This commit is contained in:
parent
44f5f059e6
commit
ee95fbbd99
|
@ -60,13 +60,15 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
api := &gophercloud.ApiCriteria{
|
||||
Name: "cloudServersOpenStack",
|
||||
Region: b.config.AccessConfig.Region(),
|
||||
VersionId: "2",
|
||||
UrlChoice: gophercloud.PublicURL,
|
||||
//fetches the api requisites from gophercloud for the appropriate
|
||||
//openstack variant
|
||||
api, err := gophercloud.PopulateApi(b.config.RunConfig.OpenstackProvider)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
csp, err := gophercloud.ServersApi(auth, *api)
|
||||
api.Region = b.config.AccessConfig.Region()
|
||||
|
||||
csp, err := gophercloud.ServersApi(auth, api)
|
||||
if err != nil {
|
||||
log.Printf("Region: %s", b.config.AccessConfig.Region())
|
||||
return nil, err
|
||||
|
|
|
@ -15,6 +15,7 @@ type RunConfig struct {
|
|||
RawSSHTimeout string `mapstructure:"ssh_timeout"`
|
||||
SSHUsername string `mapstructure:"ssh_username"`
|
||||
SSHPort int `mapstructure:"ssh_port"`
|
||||
OpenstackProvider string `mapstructure:"openstack_provider"`
|
||||
|
||||
// Unexported fields that are calculated from others
|
||||
sshTimeout time.Duration
|
||||
|
|
Loading…
Reference in New Issue