Merge lp:~billy-olsen/charms/trusty/cinder/backport-lp1398182 into lp:~openstack-charmers-archive/charms/trusty/cinder/trunk

[Billy Olsen]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #5404 cinder for billy-olsen mp262001
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5404/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #5036 cinder for billy-olsen mp262001
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5036/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4647 cinder for billy-olsen mp262001
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4647/

[Corey Bryant (corey.bryant)]

review: Approve

[lp:~billy-olsen/charms/trusty/cinder/backport-lp1398182]

97. By Billy Olsen on 2015-06-18

[billy-olsen] Official c-h stable sync

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #5462 cinder for billy-olsen mp262001
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5462/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #5094 cinder for billy-olsen mp262001
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5094/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4666 cinder for billy-olsen mp262001
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11738076/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4666/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4679 cinder for billy-olsen mp262001
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4679/

=== modified file 'config.yaml'
--- config.yaml	2015-04-02 12:13:45 +0000
+++ config.yaml	2015-06-18 23:23:26 +0000
@@ -207,6 +207,19 @@
       192.168.0.0/24)
       .
       This network will be used for public endpoints.
+  os-public-hostname:
+    type: string
+    default:
+    description: |
+      The hostname or address of the public endpoints created for cinder
+      in the keystone identity provider.
+      .
+      This value will be used for public endpoints. For example, an
+      os-public-hostname set to 'cinder.example.com' with ssl enabled will
+      create two public endpoints for cinder:
+      .
+      https://cinder.example.com:443/v1/$(tenant_id)s and
+      https://cinder.example.com:443/v2/$(tenant_id)s
   prefer-ipv6:
     type: boolean
     default: False

=== modified file 'hooks/charmhelpers/contrib/hahelpers/cluster.py'
--- hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-03-13 13:00:03 +0000
+++ hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-06-18 23:23:26 +0000
@@ -52,6 +52,8 @@
     bool_from_string,
 )
 
+DC_RESOURCE_NAME = 'DC'
+
 
 class HAIncompleteConfig(Exception):
     pass
@@ -95,6 +97,27 @@
     return False
 
 
+def is_crm_dc():
+    """
+    Determine leadership by querying the pacemaker Designated Controller
+    """
+    cmd = ['crm', 'status']
+    try:
+        status = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+        if not isinstance(status, six.text_type):
+            status = six.text_type(status, "utf-8")
+    except subprocess.CalledProcessError:
+        return False
+    current_dc = ''
+    for line in status.split('\n'):
+        if line.startswith('Current DC'):
+            # Current DC: juju-lytrusty-machine-2 (168108163) - partition with quorum
+            current_dc = line.split(':')[1].split()[0]
+    if current_dc == get_unit_hostname():
+        return True
+    return False
+
+
 @retry_on_exception(5, base_delay=2, exc_type=CRMResourceNotFound)
 def is_crm_leader(resource, retry=False):
     """
@@ -104,6 +127,8 @@
     We allow this operation to be retried to avoid the possibility of getting a
     false negative. See LP #1396246 for more info.
     """
+    if resource == DC_RESOURCE_NAME:
+        return is_crm_dc()
     cmd = ['crm', 'resource', 'show', resource]
     try:
         status = subprocess.check_output(cmd, stderr=subprocess.STDOUT)

=== modified file 'hooks/charmhelpers/contrib/openstack/ip.py'
--- hooks/charmhelpers/contrib/openstack/ip.py	2015-03-13 13:00:03 +0000
+++ hooks/charmhelpers/contrib/openstack/ip.py	2015-06-18 23:23:26 +0000
@@ -17,6 +17,7 @@
 from charmhelpers.core.hookenv import (
     config,
     unit_get,
+    service_name,
 )
 from charmhelpers.contrib.network.ip import (
     get_address_in_network,
@@ -26,8 +27,6 @@
 )
 from charmhelpers.contrib.hahelpers.cluster import is_clustered
 
-from functools import partial
-
 PUBLIC = 'public'
 INTERNAL = 'int'
 ADMIN = 'admin'
@@ -35,15 +34,18 @@
 ADDRESS_MAP = {
     PUBLIC: {
         'config': 'os-public-network',
-        'fallback': 'public-address'
+        'fallback': 'public-address',
+        'override': 'os-public-hostname',
     },
     INTERNAL: {
         'config': 'os-internal-network',
-        'fallback': 'private-address'
+        'fallback': 'private-address',
+        'override': 'os-internal-hostname',
     },
     ADMIN: {
         'config': 'os-admin-network',
-        'fallback': 'private-address'
+        'fallback': 'private-address',
+        'override': 'os-admin-hostname',
     }
 }
 
@@ -57,15 +59,50 @@
     :param endpoint_type: str endpoint type to resolve.
     :param returns: str base URL for services on the current service unit.
     """
-    scheme = 'http'
-    if 'https' in configs.complete_contexts():
-        scheme = 'https'
+    scheme = _get_scheme(configs)
+
     address = resolve_address(endpoint_type)
     if is_ipv6(address):
         address = "[{}]".format(address)
+
     return '%s://%s' % (scheme, address)
 
 
+def _get_scheme(configs):
+    """Returns the scheme to use for the url (either http or https)
+    depending upon whether https is in the configs value.
+
+    :param configs: OSTemplateRenderer config templating object to inspect
+                    for a complete https context.
+    :returns: either 'http' or 'https' depending on whether https is
+              configured within the configs context.
+    """
+    scheme = 'http'
+    if configs and 'https' in configs.complete_contexts():
+        scheme = 'https'
+    return scheme
+
+
+def _get_address_override(endpoint_type=PUBLIC):
+    """Returns any address overrides that the user has defined based on the
+    endpoint type.
+
+    Note: this function allows for the service name to be inserted into the
+    address if the user specifies {service_name}.somehost.org.
+
+    :param endpoint_type: the type of endpoint to retrieve the override
+                          value for.
+    :returns: any endpoint address or hostname that the user has overridden
+              or None if an override is not present.
+    """
+    override_key = ADDRESS_MAP[endpoint_type]['override']
+    addr_override = config(override_key)
+    if not addr_override:
+        return None
+    else:
+        return addr_override.format(service_name=service_name())
+
+
 def resolve_address(endpoint_type=PUBLIC):
     """Return unit address depending on net config.
 
@@ -77,7 +114,10 @@
 
     :param endpoint_type: Network endpoing type
     """
-    resolved_address = None
+    resolved_address = _get_address_override(endpoint_type)
+    if resolved_address:
+        return resolved_address
+
     vips = config('vip')
     if vips:
         vips = vips.split()
@@ -109,38 +149,3 @@
                          "clustered=%s)" % (net_type, clustered))
 
     return resolved_address
-
-
-def endpoint_url(configs, url_template, port, endpoint_type=PUBLIC,
-                 override=None):
-    """Returns the correct endpoint URL to advertise to Keystone.
-
-    This method provides the correct endpoint URL which should be advertised to
-    the keystone charm for endpoint creation. This method allows for the url to
-    be overridden to force a keystone endpoint to have specific URL for any of
-    the defined scopes (admin, internal, public).
-
-    :param configs: OSTemplateRenderer config templating object to inspect
-                    for a complete https context.
-    :param url_template: str format string for creating the url template. Only
-                         two values will be passed - the scheme+hostname
-                        returned by the canonical_url and the port.
-    :param endpoint_type: str endpoint type to resolve.
-    :param override: str the name of the config option which overrides the
-                     endpoint URL defined by the charm itself. None will
-                     disable any overrides (default).
-    """
-    if override:
-        # Return any user-defined overrides for the keystone endpoint URL.
-        user_value = config(override)
-        if user_value:
-            return user_value.strip()
-
-    return url_template % (canonical_url(configs, endpoint_type), port)
-
-
-public_endpoint = partial(endpoint_url, endpoint_type=PUBLIC)
-
-internal_endpoint = partial(endpoint_url, endpoint_type=INTERNAL)
-
-admin_endpoint = partial(endpoint_url, endpoint_type=ADMIN)

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2015-04-21 15:20:20 +0000
+++ unit_tests/test_cinder_hooks.py	2015-06-18 23:23:26 +0000
@@ -67,7 +67,6 @@
     'openstack_upgrade_available',
     'os_release',
     # charmhelpers.contrib.hahelpers.cluster_utils
-    'canonical_url',
     'eligible_leader',
     'get_hacluster_config',
     'execd_preinstall',
@@ -412,12 +411,13 @@
                                              vhost='openstack',
                                              relation_id='amqp:1')
 
-    def test_identity_service_joined(self):
+    @patch.object(hooks, 'canonical_url')
+    def test_identity_service_joined(self, _canonical_url):
         'It properly requests unclustered endpoint via identity-service'
         self.os_release.return_value = 'havana'
         self.unit_get.return_value = 'cindernode1'
         self.config.side_effect = self.test_config.get
-        self.canonical_url.return_value = 'http://cindernode1'
+        _canonical_url.return_value = 'http://cindernode1'
         hooks.hooks.execute(['hooks/identity-service-relation-joined'])
         expected = {
             'region': None,
@@ -434,12 +434,13 @@
         }
         self.relation_set.assert_called_with(**expected)
 
-    def test_identity_service_joined_icehouse(self):
+    @patch.object(hooks, 'canonical_url')
+    def test_identity_service_joined_icehouse(self, _canonical_url):
         'It properly requests unclustered endpoint via identity-service'
         self.os_release.return_value = 'icehouse'
         self.unit_get.return_value = 'cindernode1'
         self.config.side_effect = self.test_config.get
-        self.canonical_url.return_value = 'http://cindernode1'
+        _canonical_url.return_value = 'http://cindernode1'
         hooks.hooks.execute(['hooks/identity-service-relation-joined'])
         expected = {
             'region': None,
@@ -462,6 +463,42 @@
         }
         self.relation_set.assert_called_with(**expected)
 
+    @patch('charmhelpers.contrib.openstack.ip.config')
+    @patch('charmhelpers.contrib.openstack.ip.unit_get')
+    @patch('charmhelpers.contrib.openstack.ip.is_clustered')
+    def test_identity_service_joined_public_name(self, _is_clustered,
+                                                 _unit_get, _config):
+        self.os_release.return_value = 'icehouse'
+        self.unit_get.return_value = 'cindernode1'
+        _unit_get.return_value = 'cindernode1'
+        self.config.side_effect = self.test_config.get
+        _config.side_effect = self.test_config.get
+        self.test_config.set('os-public-hostname', 'public.example.com')
+        _is_clustered.return_value = False
+        hooks.hooks.execute(['hooks/identity-service-relation-joined'])
+        v1_url = 'http://public.example.com:8776/v1/$(tenant_id)s'
+        v2_url = 'http://public.example.com:8776/v2/$(tenant_id)s'
+        expected = {
+            'region': None,
+            'service': None,
+            'public_url': None,
+            'internal_url': None,
+            'admin_url': None,
+            'cinder_service': 'cinder',
+            'cinder_region': 'RegionOne',
+            'cinder_public_url': v1_url,
+            'cinder_admin_url': 'http://cindernode1:8776/v1/$(tenant_id)s',
+            'cinder_internal_url': 'http://cindernode1:8776/v1/$(tenant_id)s',
+            'cinderv2_service': 'cinderv2',
+            'cinderv2_region': 'RegionOne',
+            'cinderv2_public_url': v2_url,
+            'cinderv2_admin_url': 'http://cindernode1:8776/v2/$(tenant_id)s',
+            'cinderv2_internal_url': ('http://cindernode1:8776/'
+                                      'v2/$(tenant_id)s'),
+            'relation_id': None,
+        }
+        self.relation_set.assert_called_with(**expected)
+
     @patch('os.mkdir')
     def test_ceph_joined(self, mkdir):
         'It correctly prepares for a ceph changed hook'
@@ -501,8 +538,10 @@
             self.assertNotIn(c, self.CONFIGS.write.call_args_list)
         self.assertFalse(self.set_ceph_env_variables.called)
 
+    @patch('charmhelpers.core.host.service')
     @patch("cinder_hooks.relation_get", autospec=True)
-    def test_ceph_changed_broker_success(self, mock_relation_get):
+    def test_ceph_changed_broker_success(self, mock_relation_get,
+                                         _service):
         'It ensures ceph assets created on ceph changed'
         self.CONFIGS.complete_contexts.return_value = ['ceph']
         self.service_name.return_value = 'cinder'