Merge pull request #467 from sapcc/ceph-support

add support for using Ceph's Swift-API

Author: majewsky

README.md

@@ -116,6 +116,8 @@ The first paragraph contains the authentication parameters for
 OpenStack's Identity v3 API. Optionally a `region_name` can be specified, but this is only
 required if there are multiple regions to choose from. You can also specify the `tls_client_certificate_file` and `tls_client_key_file` for creating a TLS client.
 
+Additionally, you can specify a `service_type` to select which object storage service to use from the service catalog. This defaults to `object-store` for native Swift, but can be set to `object-store-ceph` when using Ceph's Swift-compatible API.
+
 You can use the `fromEnv` special syntax for the `to.container`, `to.object_prefix`, and
 the Swift fields (options under the `swift` key).
 See [specifying sensitive info as environment variables](#specifying-sensitive-info-as-environment-variables) for more details.

pkg/objects/config.go

@@ -226,6 +226,7 @@ func (cfg JobConfiguration) Compile(ctx context.Context, name string, swift Swif
 		cfg.Target.ApplicationCredentialName = swift.ApplicationCredentialName
 		cfg.Target.ApplicationCredentialSecret = swift.ApplicationCredentialSecret
 		cfg.Target.RegionName = swift.RegionName
+		cfg.Target.ServiceType = swift.ServiceType
 		errors = append(errors, cfg.Target.Validate(name+".to")...)
 	}
 

pkg/objects/swift.go

@@ -37,6 +37,7 @@ type SwiftLocation struct {
 	TLSClientCertificateFile    secrets.FromEnv `yaml:"tls_client_certificate_file"`
 	TLSClientKeyFile            secrets.FromEnv `yaml:"tls_client_key_file"`
 	RegionName                  secrets.FromEnv `yaml:"region_name"`
+	ServiceType                 secrets.FromEnv `yaml:"service_type"`
 	ContainerName               secrets.FromEnv `yaml:"container"`
 	ObjectNamePrefix            secrets.FromEnv `yaml:"object_prefix"`
 	// configuration for Validate()
@@ -61,6 +62,7 @@ func (s SwiftLocation) cacheKey(name string) string {
 		string(s.ApplicationCredentialName),
 		string(s.ApplicationCredentialSecret),
 		string(s.RegionName),
+		string(s.ServiceType),
 	}
 	if logg.ShowDebug {
 		v = append(v, name)
@@ -208,7 +210,12 @@ func (s *SwiftLocation) Connect(ctx context.Context, name string) error {
 			)
 		}
 
+		serviceType := string(s.ServiceType)
+		if serviceType == "" {
+			serviceType = "object-store"
+		}
 		serviceClient, err := openstack.NewObjectStorageV1(provider, gophercloud.EndpointOpts{
+			Type:   serviceType,
 			Region: string(s.RegionName),
 		})
 		if err != nil {