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

[Billy Olsen]

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

charm_lint_check #5409 nova-cloud-controller for billy-olsen mp262006
    LINT OK: passed

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

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

charm_unit_test #5041 nova-cloud-controller for billy-olsen mp262006
    UNIT OK: passed

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

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

charm_amulet_test #4652 nova-cloud-controller for billy-olsen mp262006
    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/11721376/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4652/

[Corey Bryant (corey.bryant)]

review: Approve

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

charm_amulet_test #4663 nova-cloud-controller for billy-olsen mp262006
    AMULET OK: passed

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

[lp:~billy-olsen/charms/trusty/nova-cloud-controller/backport-lp1398182]

165. By Billy Olsen on 2015-06-18

Official c-h stable sync

=== modified file 'config.yaml'
--- config.yaml	2015-04-20 10:21:36 +0000
+++ config.yaml	2015-06-18 23:39:46 +0000
@@ -230,6 +230,18 @@
       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 provided by the
+      nova-cloud-controller in the keystone identity provider.
+      .
+      This value will be used for public endpoints. For example, an
+      os-public-hostname set to 'ncc.example.com' with ssl enabled will
+      create public endpoints such as:
+      .
+      https://ncc.example.com:8775/v2/$(tenant_id)s
   service-guard:
     type: boolean
     default: false
 
=== modified file 'hooks/charmhelpers/contrib/hahelpers/cluster.py'
--- hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-03-16 14:17:04 +0000
+++ hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-06-18 23:39:46 +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-31 14:56:11 +0000
+++ hooks/charmhelpers/contrib/openstack/ip.py	2015-06-18 23:39:46 +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_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	2015-04-20 10:21:36 +0000
+++ unit_tests/test_nova_cc_contexts.py	2015-06-18 23:39:46 +0000
@@ -90,11 +90,13 @@
         self.assertEqual({'memcached_servers': "%s:11211" % (formated_ip, )},
                          instance_console())
 
+    @mock.patch('charmhelpers.contrib.openstack.neutron.os_release')
     @mock.patch.object(context, 'use_local_neutron_api')
     @mock.patch('charmhelpers.contrib.openstack.ip.config')
     @mock.patch('charmhelpers.contrib.openstack.ip.is_clustered')
     def test_neutron_context_single_vip(self, mock_is_clustered, mock_config,
-                                        mock_use_local_neutron_api):
+                                        mock_use_local_neutron_api,
+                                        _os_release):
         mock_use_local_neutron_api.return_value = True
         self.https.return_value = False
         mock_is_clustered.return_value = True
@@ -102,7 +104,7 @@
                   'os-internal-network': '10.0.0.1/24',
                   'os-admin-network': '10.0.1.0/24',
                   'os-public-network': '10.0.2.0/24'}
-        mock_config.side_effect = lambda key: config[key]
+        mock_config.side_effect = lambda key: config.get(key)
 
         mock_use_local_neutron_api.return_value = False
         ctxt = context.NeutronCCContext()()
@@ -114,18 +116,20 @@
         self.assertEqual(ctxt['nova_url'], 'http://10.0.0.1:8774/v2')
         self.assertEqual(ctxt['neutron_url'], 'http://10.0.0.1:9696')
 
+    @mock.patch('charmhelpers.contrib.openstack.neutron.os_release')
     @mock.patch.object(context, 'use_local_neutron_api')
     @mock.patch('charmhelpers.contrib.openstack.ip.config')
     @mock.patch('charmhelpers.contrib.openstack.ip.is_clustered')
     def test_neutron_context_multi_vip(self, mock_is_clustered, mock_config,
-                                       mock_use_local_neutron_api):
+                                       mock_use_local_neutron_api,
+                                       _os_release):
         self.https.return_value = False
         mock_is_clustered.return_value = True
         config = {'vip': '10.0.0.1 10.0.1.1 10.0.2.1',
                   'os-internal-network': '10.0.1.0/24',
                   'os-admin-network': '10.0.0.0/24',
                   'os-public-network': '10.0.2.0/24'}
-        mock_config.side_effect = lambda key: config[key]
+        mock_config.side_effect = lambda key: config.get(key)
 
         mock_use_local_neutron_api.return_value = False
         ctxt = context.NeutronCCContext()()
 
=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-06-15 09:50:18 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-06-18 23:39:46 +0000
@@ -25,13 +25,13 @@
     'api_port',
     'apt_update',
     'apt_install',
-    'canonical_url',
     'configure_installation_source',
     'charm_dir',
     'do_openstack_upgrade',
     'openstack_upgrade_available',
     'cmd_all_services',
     'config',
+    'determine_endpoints',
     'determine_packages',
     'determine_ports',
     'disable_services',
@@ -114,7 +114,12 @@
         self.assertTrue(self.save_script_rc.called)
         mock_filter_packages.assert_called_with([])
 
+<<<<<<< TREE
     @patch.object(hooks, 'filter_installed_packages')
+=======
+    @patch('charmhelpers.contrib.openstack.ip.service_name',
+           lambda *args: 'nova-cloud-controller')
+>>>>>>> MERGE-SOURCE
     @patch.object(hooks, 'cluster_joined')
     @patch.object(hooks, 'identity_joined')
     @patch.object(hooks, 'neutron_api_relation_joined')
@@ -193,9 +198,11 @@
         self.assertEquals(sorted(self.relation_set.call_args_list),
                           sorted(expected_relations))
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(utils, 'config')
     @patch.object(hooks, '_auth_config')
-    def test_compute_joined_neutron(self, auth_config, _util_config):
+    def test_compute_joined_neutron(self, auth_config, _util_config,
+                                    _canonical_url):
         _util_config.return_value = None
         self.is_relation_made.return_value = False
         self.network_manager.return_value = 'neutron'
@@ -203,7 +210,7 @@
         self.keystone_ca_cert_b64.return_value = 'foocert64'
         self.volume_service.return_value = 'cinder'
         self.unit_get.return_value = 'nova-cc-host1'
-        self.canonical_url.return_value = 'http://nova-cc-host1'
+        _canonical_url.return_value = 'http://nova-cc-host1'
         self.api_port.return_value = '9696'
         self.neutron_plugin.return_value = 'nvp'
         auth_config.return_value = FAKE_KS_AUTH_CFG
@@ -222,11 +229,12 @@
             quantum_plugin='nvp',
             network_manager='neutron', **FAKE_KS_AUTH_CFG)
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(utils, 'config')
     @patch.object(hooks, 'NeutronAPIContext')
     @patch.object(hooks, '_auth_config')
     def test_compute_joined_neutron_api_rel(self, auth_config, napi,
-                                            _util_config):
+                                            _util_config, _canonical_url):
         def mock_NeutronAPIContext():
             return {
                 'neutron_plugin': 'bob',
@@ -241,7 +249,7 @@
         self.keystone_ca_cert_b64.return_value = 'foocert64'
         self.volume_service.return_value = 'cinder'
         self.unit_get.return_value = 'nova-cc-host1'
-        self.canonical_url.return_value = 'http://nova-cc-host1'
+        _canonical_url.return_value = 'http://nova-cc-host1'
         self.api_port.return_value = '9696'
         self.neutron_plugin.return_value = 'nvp'
         auth_config.return_value = FAKE_KS_AUTH_CFG
@@ -259,13 +267,14 @@
             quantum_plugin='bob',
             network_manager='neutron', **FAKE_KS_AUTH_CFG)
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(hooks, '_auth_config')
-    def test_nova_vmware_joined(self, auth_config):
+    def test_nova_vmware_joined(self, auth_config, _canonical_url):
         auth_config.return_value = FAKE_KS_AUTH_CFG
         # quantum-security-groups, plugin
         self.neutron_plugin.return_value = 'nvp'
         self.network_manager.return_value = 'neutron'
-        self.canonical_url.return_value = 'http://nova-cc-host1'
+        _canonical_url.return_value = 'http://nova-cc-host1'
         self.api_port.return_value = '9696'
         hooks.nova_vmware_relation_joined()
         self.relation_set.assert_called_with(
@@ -283,6 +292,25 @@
                                              nova_hostname='nova.foohost.com')
         self.unit_get.assert_called_with('private-address')
 
+    @patch('charmhelpers.contrib.openstack.ip.service_name',
+           lambda *args: 'nova-cloud-controller')
+    @patch('charmhelpers.contrib.openstack.ip.unit_get')
+    @patch('charmhelpers.contrib.openstack.ip.is_clustered')
+    @patch('charmhelpers.contrib.openstack.ip.config')
+    def test_identity_joined(self, _ip_config, _is_clustered, _unit_get):
+        _is_clustered.return_value = False
+        _unit_get.return_value = '127.0.0.1'
+        _ip_config.side_effect = self.test_config.get
+
+        self.test_config.set('os-public-hostname', 'ncc.example.com')
+        hooks.identity_joined()
+
+        self.determine_endpoints.asssert_called_with(
+            public_url='http://ncc.example.com',
+            internal_url='http://127.0.0.1',
+            admin_url='http://127.0.0.1'
+        )
+
     def test_postgresql_nova_db_joined(self):
         self.is_relation_made.return_value = False
         hooks.pgsql_nova_db_joined()
@@ -447,9 +475,10 @@
                            call('/etc/neutron/neutron.conf')])
         cell_joined.assert_called_with(rid='nova-cell-api/0')
 
-    def test_nova_cell_relation_joined(self):
+    @patch.object(hooks, 'canonical_url')
+    def test_nova_cell_relation_joined(self, _canonical_url):
         self.uuid.uuid4.return_value = 'bob'
-        self.canonical_url.return_value = 'http://novaurl'
+        _canonical_url.return_value = 'http://novaurl'
         hooks.nova_cell_relation_joined(rid='rid',
                                         remote_restart=True)
         self.relation_set.assert_called_with(restart_trigger='bob',
@@ -468,19 +497,20 @@
         }
         self.assertEquals(hooks.get_cell_type(), 'parent')
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(os, 'rename')
     @patch.object(os.path, 'isfile')
     @patch.object(hooks, 'CONFIGS')
     @patch.object(hooks, 'get_cell_type')
     def test_neutron_api_relation_joined(self, get_cell_type, configs, isfile,
-                                         rename):
+                                         rename, _canonical_url):
         neutron_conf = '/etc/neutron/neutron.conf'
         nova_url = 'http://novaurl:8774/v2'
         isfile.return_value = True
         self.service_running.return_value = True
         _identity_joined = self.patch('identity_joined')
         self.relation_ids.return_value = ['relid']
-        self.canonical_url.return_value = 'http://novaurl'
+        _canonical_url.return_value = 'http://novaurl'
         get_cell_type.return_value = 'parent'
         self.uuid.uuid4.return_value = 'bob'
         with patch_open() as (_open, _file):
@@ -517,11 +547,12 @@
         self.assertTrue(_compute_joined.called)
         self.assertTrue(_quantum_joined.called)
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(utils, 'config')
-    def test_console_settings_vnc(self, _utils_config):
+    def test_console_settings_vnc(self, _utils_config, _canonical_url):
         _utils_config.return_value = 'vnc'
         _cc_host = "nova-cc-host1"
-        self.canonical_url.return_value = 'http://' + _cc_host
+        _canonical_url.return_value = 'http://' + _cc_host
         _con_sets = hooks.console_settings()
         console_settings = {
             'console_proxy_novnc_address': 'http://%s:6080/vnc_auto.html' %
@@ -537,11 +568,12 @@
         }
         self.assertEqual(_con_sets, console_settings)
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(utils, 'config')
-    def test_console_settings_xvpvnc(self, _utils_config):
+    def test_console_settings_xvpvnc(self, _utils_config, _canonical_url):
         _utils_config.return_value = 'xvpvnc'
         _cc_host = "nova-cc-host1"
-        self.canonical_url.return_value = 'http://' + _cc_host
+        _canonical_url.return_value = 'http://' + _cc_host
         _con_sets = hooks.console_settings()
         console_settings = {
             'console_access_protocol': 'xvpvnc',
@@ -553,11 +585,12 @@
         }
         self.assertEqual(_con_sets, console_settings)
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(utils, 'config')
-    def test_console_settings_novnc(self, _utils_config):
+    def test_console_settings_novnc(self, _utils_config, _canonical_url):
         _utils_config.return_value = 'novnc'
         _cc_host = "nova-cc-host1"
-        self.canonical_url.return_value = 'http://' + _cc_host
+        _canonical_url.return_value = 'http://' + _cc_host
         _con_sets = hooks.console_settings()
         console_settings = {
             'console_proxy_novnc_address': 'http://%s:6080/vnc_auto.html' %
@@ -569,11 +602,12 @@
         }
         self.assertEqual(_con_sets, console_settings)
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(utils, 'config')
-    def test_console_settings_spice(self, _utils_config):
+    def test_console_settings_spice(self, _utils_config, _canonical_url):
         _utils_config.return_value = 'spice'
         _cc_host = "nova-cc-host1"
-        self.canonical_url.return_value = 'http://' + _cc_host
+        _canonical_url.return_value = 'http://' + _cc_host
         _con_sets = hooks.console_settings()
         console_settings = {
             'console_proxy_spice_address': 'http://%s:6082/spice_auto.html' %
@@ -585,14 +619,16 @@
         }
         self.assertEqual(_con_sets, console_settings)
 
+    @patch.object(hooks, 'canonical_url')
     @patch.object(utils, 'config')
-    def test_console_settings_explicit_ip(self, _utils_config):
+    def test_console_settings_explicit_ip(self, _utils_config,
+                                          _canonical_url):
         _utils_config.return_value = 'spice'
         _cc_public_host = "public-host"
         _cc_private_host = "private-host"
         self.test_config.set('console-proxy-ip', _cc_public_host)
         _con_sets = hooks.console_settings()
-        self.canonical_url.return_value = 'http://' + _cc_private_host
+        _canonical_url.return_value = 'http://' + _cc_private_host
         console_settings = {
             'console_proxy_spice_address': 'http://%s:6082/spice_auto.html' %
                                            (_cc_public_host),