From c1b9ef6743fd2f32af1bb2beafdb2289db744678 Mon Sep 17 00:00:00 2001
From: LingFaKe <lingfake@huawei.com>
Date: Fri, 5 Jun 2015 17:31:09 -0700
Subject: [PATCH] Add option parameter availability_zone

Signed-off-by: Ling FaKe <lingfake@huawei.com>
---
 drivers/openstack/client.go    | 9 +++++----
 drivers/openstack/openstack.go | 8 ++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/openstack/client.go b/drivers/openstack/client.go
index 218af191b0..c2964512e4 100644
--- a/drivers/openstack/client.go
+++ b/drivers/openstack/client.go
@@ -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{
diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go
index 2bba3e5ed1..3bae763e9a 100644
--- a/drivers/openstack/openstack.go
+++ b/drivers/openstack/openstack.go
@@ -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")