90c4f05b2a
* Removes redundant cindercli behaviors
* Adds os_auth_system as parameter to cindercli client init.
* Renames client methods to match CLI names ('create_volume' in
the cinder client is now just 'create', etc.)
* Adds the cinder composite.
* Adds os_region_name and os_auth_system as configurable options
to cinder config
* Adds os_region_name to nova config.
Change-Id: I999c39fc9d99b689bf4c8ff967fd8b05c6ee79b3
43 lines
1.8 KiB
Python
43 lines
1.8 KiB
Python
"""
|
|
Copyright 2014 Rackspace
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
"""
|
|
|
|
from cloudcafe.openstackcli.cindercli.client import CinderCLI
|
|
from cloudcafe.openstackcli.common.config import OpenstackCLI_CommonConfig
|
|
from cloudcafe.openstackcli.cindercli.config import CinderCLI_Config
|
|
|
|
|
|
class CinderCLI_Composite(object):
|
|
|
|
def __init__(self):
|
|
self.openstack_config = OpenstackCLI_CommonConfig()
|
|
self.config = CinderCLI_Config()
|
|
self._cli_kwargs = {
|
|
'volume_service_name': self.config.volume_service_name,
|
|
'os_volume_api_version': self.config.os_volume_api_version,
|
|
'os_username': self.openstack_config.os_username,
|
|
'os_password': self.openstack_config.os_password,
|
|
'os_tenant_name': self.openstack_config.os_tenant_name,
|
|
'os_auth_url': self.openstack_config.os_auth_url,
|
|
'os_region_name': self.config.os_region_name or
|
|
self.openstack_config.os_region_name,
|
|
'os_cacert': self.openstack_config.os_cacert,
|
|
'os_auth_system': self.config.os_auth_system,
|
|
'retries': self.openstack_config.retries,
|
|
'debug': self.openstack_config.debug}
|
|
self.client = CinderCLI(**self._cli_kwargs)
|
|
self.client.set_environment_variables(
|
|
self.config.environment_variable_dictionary)
|