diff options
| author | Monty Taylor <mordred@inaugust.com> | 2014-09-21 14:17:38 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2014-09-21 14:17:38 -0700 |
| commit | 69d2a3e0ad97a20cec498ab87c81af5e11e5c79c (patch) | |
| tree | 28e7a2376f1db59693a97a19a4d720654f78c181 | |
| parent | 9bbb4f30f49eb157d31a9aa1c37aca3004656009 (diff) | |
| download | os-client-config-69d2a3e0ad97a20cec498ab87c81af5e11e5c79c.tar.gz | |
Get rid of extra complexity with service values0.1.0
We don't need to enumerate the service types - we can simply match
at consumption time on patterns.
| -rw-r--r-- | os_client_config/config.py | 13 | ||||
| -rw-r--r-- | os_client_config/vendors.py | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 1742b5b..5cc8edd 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -30,9 +30,6 @@ CONFIG_FILES = [ os.path.join(d, 'clouds.yaml') for d in CONFIG_SEARCH_PATH] BOOL_KEYS = ('insecure', 'cache') REQUIRED_VALUES = ('auth_url', 'username', 'password', 'project_id') -SERVICES = ( - 'compute', 'identity', 'network', 'metering', 'object-store', - 'volume', 'dns', 'image', 'database') def get_boolean(value): @@ -54,16 +51,12 @@ class OpenStackConfig(object): defaults.add('project_domain_name') defaults.add('auth_url') defaults.add('region_name') - defaults.add('cache', 'false') + defaults.add('cache') defaults.add('auth_token') - defaults.add('insecure', 'false') + defaults.add('insecure') + defaults.add('endpoint_type') defaults.add('cacert') - for service in SERVICES: - defaults.add('service_name', prefix=service) - defaults.add('service_type', prefix=service) - defaults.add('endpoint_type', prefix=service) - defaults.add('endpoint', prefix=service) self.defaults = defaults # use a config file if it exists where expected diff --git a/os_client_config/vendors.py b/os_client_config/vendors.py index d1b29a5..71cf158 100644 --- a/os_client_config/vendors.py +++ b/os_client_config/vendors.py @@ -16,10 +16,10 @@ CLOUD_DEFAULTS = dict( hp=dict( auth_url='https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0', region_name='region-b.geo-1', + dns_service_type='hp:dns', ), rackspace=dict( auth_url='https://identity.api.rackspacecloud.com/v2.0/', - image_endpoint='https://{region_name}.images.api.rackspacecloud.com/', database_service_type='rax:database', ) ) |