Merge "Enable deploying Trove instances into single tenant"

trove/common/cfg.py

@@ -329,8 +329,9 @@ common_opts = [
     cfg.StrOpt('nova_proxy_admin_pass', default='',
                help="Admin password used to connect to Nova.", secret=True),
     cfg.StrOpt('nova_proxy_admin_tenant_id', default='',
-               deprecated_name='nova_proxy_admin_tenant_name',
                help="Admin tenant ID used to connect to Nova.", secret=True),
+    cfg.StrOpt('nova_proxy_admin_tenant_name', default='',
+               help="Admin tenant name used to connect to Nova.", secret=True),
     cfg.StrOpt('network_label_regex', default='^private$',
                help='Regular expression to match Trove network labels.'),
     cfg.StrOpt('ip_regex', default=None,

trove/common/single_tenant_remote.py

@@ -0,0 +1,119 @@
+# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+#
+# 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 trove.common import cfg
+from trove.common.remote import normalize_url
+import trove.openstack.common.log as logging
+
+from cinderclient.v2 import client as CinderClient
+from neutronclient.v2_0 import client as NeutronClient
+from novaclient.v1_1.client import Client as NovaClient
+
+CONF = cfg.CONF
+
+"""
+trove.conf
+...
+
+The following should be set in the trove CONF file for this
+single_tenant_remote config to work correctly.
+
+nova_proxy_admin_user =
+nova_proxy_admin_pass =
+nova_proxy_admin_tenant_name =
+trove_auth_url =
+nova_compute_service_type =
+nova_compute_url =
+cinder_service_type =
+os_region_name =
+
+remote_nova_client = \
+ trove.common.single_tenant_remote.nova_client_trove_admin
+remote_cinder_client = \
+ trove.common.single_tenant_remote.cinder_client_trove_admin
+remote_neutron_client = \
+ trove.common.single_tenant_remote.neutron_client_trove_admin
+...
+
+"""
+
+PROXY_AUTH_URL = CONF.trove_auth_url
+LOG = logging.getLogger(__name__)
+
+
+def nova_client_trove_admin(context=None):
+    """
+    Returns a nova client object with the trove admin credentials
+    :param context: original context from user request
+    :type context: trove.common.context.TroveContext
+    :return novaclient: novaclient with trove admin credentials
+    :rtype: novaclient.v1_1.client.Client
+    """
+    client = NovaClient(CONF.nova_proxy_admin_user,
+                        CONF.nova_proxy_admin_pass,
+                        CONF.nova_proxy_admin_tenant_name,
+                        auth_url=PROXY_AUTH_URL,
+                        service_type=CONF.nova_compute_service_type,
+                        region_name=CONF.os_region_name)
+
+    if CONF.nova_compute_url and CONF.nova_proxy_admin_tenant_id:
+        client.client.management_url = "%s/%s/" % (
+            normalize_url(CONF.nova_compute_url),
+            CONF.nova_proxy_admin_tenant_id)
+
+    return client
+
+
+def cinder_client_trove_admin(context=None):
+    """
+    Returns a cinder client object with the trove admin credentials
+    :param context: original context from user request
+    :type context: trove.common.context.TroveContext
+    :return cinderclient: cinderclient with trove admin credentials
+    """
+    client = CinderClient.Client(CONF.nova_proxy_admin_user,
+                                 CONF.nova_proxy_admin_pass,
+                                 project_id=CONF.nova_proxy_admin_tenant_name,
+                                 auth_url=PROXY_AUTH_URL,
+                                 service_type=CONF.cinder_service_type,
+                                 region_name=CONF.os_region_name)
+
+    if CONF.cinder_url and CONF.nova_proxy_admin_tenant_id:
+        client.client.management_url = "%s/%s/" % (
+            normalize_url(CONF.cinder_url), CONF.nova_proxy_admin_tenant_id)
+
+    return client
+
+
+def neutron_client_trove_admin(context=None):
+    """
+    Returns a neutron client object with the trove admin credentials
+    :param context: original context from user request
+    :type context: trove.common.context.TroveContext
+    :return neutronclient: neutronclient with trove admin credentials
+    """
+    client = NeutronClient.Client(
+        username=CONF.nova_proxy_admin_user,
+        password=CONF.nova_proxy_admin_pass,
+        tenant_name=CONF.nova_proxy_admin_tenant_name,
+        auth_url=PROXY_AUTH_URL,
+        service_type=CONF.neutron_service_type,
+        region_name=CONF.os_region_name)
+
+    if CONF.neutron_url:
+        client.management_url = CONF.neutron_url
+
+    return client