diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d0e819413b..e12f57d4c7 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1482,123 +1482,123 @@ }, { "ImportPath": "github.com/gophercloud/gophercloud", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/blockstorage/v1/apiversions", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumes", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/common/extensions", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/compute/v2/images", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/compute/v2/servers", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/extensions/trusts", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/members", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/monitors", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/pools", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/vips", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/listeners", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/loadbalancers", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/monitors", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/pools", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/networking/v2/ports", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/utils", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/pagination", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gorilla/context", diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index 6a1985dc9b..7f6082d50e 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -416,31 +416,31 @@ }, { "ImportPath": "github.com/gophercloud/gophercloud", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/openstack/utils", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/gophercloud/gophercloud/pagination", - "Rev": "9a5595b8ffe429439c63781cdc312c254e4ad990" + "Rev": "ce1e02c3ccfdb7fab257340dc4d603ec3035fa11" }, { "ImportPath": "github.com/grpc-ecosystem/go-grpc-prometheus", diff --git a/vendor/github.com/gophercloud/gophercloud/auth_options.go b/vendor/github.com/gophercloud/gophercloud/auth_options.go index 7a16131093..eabf182075 100644 --- a/vendor/github.com/gophercloud/gophercloud/auth_options.go +++ b/vendor/github.com/gophercloud/gophercloud/auth_options.go @@ -139,14 +139,6 @@ func (opts *AuthOptions) ToTokenV3CreateMap(scope map[string]interface{}) (map[s // if insufficient or incompatible information is present. var req request - // Test first for unrecognized arguments. - if opts.TenantID != "" { - return nil, ErrTenantIDProvided{} - } - if opts.TenantName != "" { - return nil, ErrTenantNameProvided{} - } - if opts.Password == "" { if opts.TokenID != "" { // Because we aren't using password authentication, it's an error to also provide any of the user-based authentication @@ -259,15 +251,12 @@ func (opts *AuthOptions) ToTokenV3ScopeMap() (map[string]interface{}, error) { if opts.TenantID != "" { scope.ProjectID = opts.TenantID - opts.TenantID = "" - opts.TenantName = "" } else { if opts.TenantName != "" { scope.ProjectName = opts.TenantName scope.DomainID = opts.DomainID scope.DomainName = opts.DomainName } - opts.TenantName = "" } if scope.ProjectName != "" { diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go b/vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go index 77f7e37a48..59ba721d6f 100644 --- a/vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go +++ b/vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules/requests.go @@ -47,13 +47,31 @@ type RuleEtherType string // Constants useful for CreateOpts const ( - DirIngress RuleDirection = "ingress" - DirEgress RuleDirection = "egress" - ProtocolTCP RuleProtocol = "tcp" - ProtocolUDP RuleProtocol = "udp" - ProtocolICMP RuleProtocol = "icmp" - EtherType4 RuleEtherType = "IPv4" - EtherType6 RuleEtherType = "IPv6" + DirIngress RuleDirection = "ingress" + DirEgress RuleDirection = "egress" + EtherType4 RuleEtherType = "IPv4" + EtherType6 RuleEtherType = "IPv6" + ProtocolAH RuleProtocol = "ah" + ProtocolDCCP RuleProtocol = "dccp" + ProtocolEGP RuleProtocol = "egp" + ProtocolESP RuleProtocol = "esp" + ProtocolGRE RuleProtocol = "gre" + ProtocolICMP RuleProtocol = "icmp" + ProtocolIGMP RuleProtocol = "igmp" + ProtocolIPv6Encap RuleProtocol = "ipv6-encap" + ProtocolIPv6Frag RuleProtocol = "ipv6-frag" + ProtocolIPv6ICMP RuleProtocol = "ipv6-icmp" + ProtocolIPv6NoNxt RuleProtocol = "ipv6-nonxt" + ProtocolIPv6Opts RuleProtocol = "ipv6-opts" + ProtocolIPv6Route RuleProtocol = "ipv6-route" + ProtocolOSPF RuleProtocol = "ospf" + ProtocolPGM RuleProtocol = "pgm" + ProtocolRSVP RuleProtocol = "rsvp" + ProtocolSCTP RuleProtocol = "sctp" + ProtocolTCP RuleProtocol = "tcp" + ProtocolUDP RuleProtocol = "udp" + ProtocolUDPLite RuleProtocol = "udplite" + ProtocolVRRP RuleProtocol = "vrrp" ) // CreateOptsBuilder is what types must satisfy to be used as Create