github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27810 from hpcloud/lbaas-v2-liberty-fix

Browse Source 
Automatic merge from submit-queue

Removing name field from Member for compatibility with OpenStack Liberty

In OpenStack Mitaka, the name field for members was added as an optional field but does not exist in Liberty.  Therefore the current implementation for lbaas v2 will not work in Liberty.
This commit is contained in:
k8s-merge-robot
2016-06-22 11:22:48 -07:00
committed by GitHub
parent 73b0b31313 53805caa60
commit b7ac841e7f
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View File

@@ -394,7 +394,6 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(apiService *api.Service, hosts []string
waitLoadbalancerActiveProvisioningStatus(lbaas.network, loadbalancer.ID) waitLoadbalancerActiveProvisioningStatus(lbaas.network, loadbalancer.ID)
_, err = v2_pools.CreateAssociateMember(lbaas.network, pool.ID, v2_pools.MemberCreateOpts{ _, err = v2_pools.CreateAssociateMember(lbaas.network, pool.ID, v2_pools.MemberCreateOpts{
Name: name,
ProtocolPort: int(ports[0].NodePort), //TODO: need to handle multi-port ProtocolPort: int(ports[0].NodePort), //TODO: need to handle multi-port
Address: addr, Address: addr,
SubnetID: lbaas.opts.SubnetId, SubnetID: lbaas.opts.SubnetId,