centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 23:38:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add option parameter availability_zone

Browse Source 
Signed-off-by: Ling FaKe <lingfake@huawei.com>
This commit is contained in:
LingFaKe
2015-06-05 17:31:09 -07:00
committed by Truman Ling
parent 30c2086cdf
commit c1b9ef6743
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/openstack/client.go
View File

@@ -54,10 +54,11 @@ type GenericClient struct {
func (c *GenericClient) CreateInstance(d *Driver) (string, error) {
serverOpts := servers.CreateOpts{
Name: d.MachineName,
FlavorRef: d.FlavorId,
ImageRef: d.ImageId,
SecurityGroups: d.SecurityGroups,
Name: d.MachineName,
FlavorRef: d.FlavorId,
ImageRef: d.ImageId,
SecurityGroups: d.SecurityGroups,
AvailabilityZone: d.AvailabilityZone,
}
if d.NetworkId != "" {
serverOpts.Networks = []servers.Network{

8
drivers/openstack/openstack.go
View File

@@ -25,6 +25,7 @@ type Driver struct {
TenantName string
TenantId string
Region string
AvailabilityZone string
EndpointType string
MachineName string
MachineId string
@@ -111,6 +112,12 @@ func GetCreateFlags() []cli.Flag {
Usage: "OpenStack region name",
Value: "",
},
cli.StringFlag{
EnvVar: "OS_AVAILABILITY_ZONE",
Name: "openstack-availability-zone",
Usage: "OpenStack availability zone",
Value: "",
},
cli.StringFlag{
EnvVar: "OS_ENDPOINT_TYPE",
Name: "openstack-endpoint-type",
@@ -241,6 +248,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.TenantName = flags.String("openstack-tenant-name")
d.TenantId = flags.String("openstack-tenant-id")
d.Region = flags.String("openstack-region")
d.AvailabilityZone = flags.String("openstack-availability-zone")
d.EndpointType = flags.String("openstack-endpoint-type")
d.FlavorId = flags.String("openstack-flavor-id")
d.FlavorName = flags.String("openstack-flavor-name")