Commit b6721beb authored by Davanum Srinivas's avatar Davanum Srinivas

Changes in OpenStack cloud provider for latest gophercloud

parent 73326ef0
...@@ -994,7 +994,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv ...@@ -994,7 +994,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
} }
portID := loadbalancer.VipPortID portID := loadbalancer.VipPortID
update_opts := neutronports.UpdateOpts{SecurityGroups: []string{lbSecGroup.ID}} update_opts := neutronports.UpdateOpts{SecurityGroups: &[]string{lbSecGroup.ID}}
res := neutronports.Update(lbaas.network, portID, update_opts) res := neutronports.Update(lbaas.network, portID, update_opts)
if res.Err != nil { if res.Err != nil {
glog.Errorf("Error occured updating port: %s", portID) glog.Errorf("Error occured updating port: %s", portID)
......
...@@ -121,7 +121,7 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron ...@@ -121,7 +121,7 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron
origPairs := port.AllowedAddressPairs // shallow copy origPairs := port.AllowedAddressPairs // shallow copy
_, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{ _, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{
AllowedAddressPairs: newPairs, AllowedAddressPairs: &newPairs,
}).Extract() }).Extract()
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -130,7 +130,7 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron ...@@ -130,7 +130,7 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron
unwinder := func() { unwinder := func() {
glog.V(4).Info("Reverting allowed-address-pairs change to port ", port.ID) glog.V(4).Info("Reverting allowed-address-pairs change to port ", port.ID)
_, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{ _, err := neutronports.Update(network, port.ID, neutronports.UpdateOpts{
AllowedAddressPairs: origPairs, AllowedAddressPairs: &origPairs,
}).Extract() }).Extract()
if err != nil { if err != nil {
glog.Warning("Unable to reset allowed-address-pairs during error unwind: ", err) glog.Warning("Unable to reset allowed-address-pairs during error unwind: ", err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment