Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix syntax and move init calls to the driver.

Browse Source 
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
This commit is contained in:
Ash Wilson
2014-12-12 10:00:40 -05:00
committed by Guillaume Giamarchi
parent 2fb9061142
commit 9fc0e3d72b
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/openstack/openstack.go
View File

@@ -446,8 +446,11 @@ func (d *Driver) foundIP(ip string) string {
}
func (d *Driver) resolveIds() error {
if d.NetworkName != "" {
if err := d.initNetwork(); err != nil {
return err
}
networkId, err := d.client.GetNetworkId(d, d.NetworkName)
if err != nil {
@@ -466,6 +469,9 @@ func (d *Driver) resolveIds() error {
}
if d.FlavorName != "" {
if err := d.initCompute(); err != nil {
return err
}
flavorId, err := d.client.GetFlavorId(d, d.FlavorName)
if err != nil {
@@ -484,6 +490,9 @@ func (d *Driver) resolveIds() error {
}
if d.ImageName != "" {
if err := d.initCompute(); err != nil {
return err
}
imageId, err := d.client.GetImageId(d, d.ImageName)
if err != nil {
@@ -501,6 +510,9 @@ func (d *Driver) resolveIds() error {
}).Debug("Found image id using its name")
}
return nil
}
func (d *Driver) initCompute() error {
if err := d.client.Authenticate(d); err != nil {
return err