docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use hostname for azure instead of generating 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-01-29 12:50:47 -05:00
parent 7d6fd1f791
commit daa8238a41
No known key found for this signature in database
GPG Key ID: A519480096146526
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/azure/azure.go
View File

@ -108,16 +108,7 @@ func GetCreateFlags() []cli.Flag {
}
func NewDriver(machineName string, storePath string, caCert string, privateKey string) (drivers.Driver, error) {
t := time.Now().Format("20060102150405")
name := fmt.Sprintf("%s-%s", machineName, t)
// trim name to 24 chars due to the azure dns name limit
if len(name) > 24 {
name = name[0:24]
}
driver := &Driver{MachineName: name, storePath: storePath, CaCertPath: caCert, PrivateKeyPath: privateKey}
driver := &Driver{MachineName: machineName, storePath: storePath, CaCertPath: caCert, PrivateKeyPath: privateKey}
return driver, nil
}
@ -173,6 +164,20 @@ func (driver *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
}
func (driver *Driver) PreCreateCheck() error {
if err := driver.setUserSubscription(); err != nil {
return err
}
// check azure DNS to make sure name is available
available, res, err := vmClient.CheckHostedServiceNameAvailability(driver.MachineName)
if err != nil {
return err
}
if !available {
return fmt.Errorf(res)
}
return nil
}