Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/workload-status into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

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

charm_lint_check #11534 nova-cloud-controller-next for gnuoy mp273837
    LINT OK: passed

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

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

charm_unit_test #10726 nova-cloud-controller-next for gnuoy mp273837
    UNIT OK: passed

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

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

charm_amulet_test #7239 nova-cloud-controller-next for gnuoy mp273837
    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/12718842/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7239/

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/utils.py'
--- hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-09-22 02:07:16 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-10-08 13:31:32 +0000
@@ -752,7 +752,7 @@
             self.log.debug('SSL is enabled  @{}:{} '
                            '({})'.format(host, port, unit_name))
             return True
-        elif not port and not conf_ssl:
+        elif not conf_ssl:
             self.log.debug('SSL not enabled @{}:{} '
                            '({})'.format(host, port, unit_name))
             return False

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-09-22 02:45:17 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-10-08 13:31:32 +0000
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
+import glob
 import json
 import os
 import re
@@ -1363,7 +1364,7 @@
             normalized.update({port: port for port in resolved
                                if port in ports})
             if resolved:
-                return {bridge: normalized[port] for port, bridge in
+                return {normalized[port]: bridge for port, bridge in
                         six.iteritems(portmap) if port in normalized.keys()}
 
         return None
@@ -1374,12 +1375,22 @@
     def __call__(self):
         ctxt = {}
         mappings = super(PhyNICMTUContext, self).__call__()
-        if mappings and mappings.values():
-            ports = mappings.values()
+        if mappings and mappings.keys():
+            ports = sorted(mappings.keys())
             napi_settings = NeutronAPIContext()()
             mtu = napi_settings.get('network_device_mtu')
+            all_ports = set()
+            # If any of ports is a vlan device, its underlying device must have
+            # mtu applied first.
+            for port in ports:
+                for lport in glob.glob("/sys/class/net/%s/lower_*" % port):
+                    lport = os.path.basename(lport)
+                    all_ports.add(lport.split('_')[1])
+
+            all_ports = list(all_ports)
+            all_ports.extend(ports)
             if mtu:
-                ctxt["devs"] = '\\n'.join(ports)
+                ctxt["devs"] = '\\n'.join(all_ports)
                 ctxt['mtu'] = mtu
 
         return ctxt

=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2015-09-22 02:45:17 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2015-10-08 13:31:32 +0000
@@ -310,10 +310,10 @@
 def parse_data_port_mappings(mappings, default_bridge='br-data'):
     """Parse data port mappings.
 
-    Mappings must be a space-delimited list of port:bridge mappings.
+    Mappings must be a space-delimited list of bridge:port.
 
-    Returns dict of the form {port:bridge} where port may be an mac address or
-    interface name.
+    Returns dict of the form {port:bridge} where ports may be mac addresses or
+    interface names.
     """
 
     # NOTE(dosaboy): we use rvalue for key to allow multiple values to be

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/ceph.conf'
--- hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-07-16 20:18:38 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-10-08 13:31:32 +0000
@@ -13,3 +13,9 @@
 err to syslog = {{ use_syslog }}
 clog to syslog = {{ use_syslog }}
 
+[client]
+{% if rbd_client_cache_settings -%}
+{% for key, value in rbd_client_cache_settings.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{%- endif %}
\ No newline at end of file

=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2015-10-02 14:15:57 +0000
+++ hooks/nova_cc_context.py	2015-10-08 13:31:32 +0000
@@ -81,7 +81,20 @@
         return {}
 
 
+class CloudComputeContext(context.OSContextGenerator):
+    "Dummy context used by service status to check relation exists"
+    interfaces = ['nova-compute']
+
+    def __call__(self):
+        ctxt = {}
+        rids = [rid for rid in relation_ids('cloud-compute')]
+        if rids:
+            ctxt['rids'] = rids
+        return ctxt
+
+
 class NeutronAPIContext(context.OSContextGenerator):
+    interfaces = ['neutron-api']
 
     def __call__(self):
         log('Generating template context from neutron api relation')
@@ -102,7 +115,7 @@
 
 
 class VolumeServiceContext(context.OSContextGenerator):
-    interfaces = []
+    interfaces = ['nova-volume-service', 'cinder-volume-service']
 
     def __call__(self):
         ctxt = {}
@@ -228,7 +241,7 @@
 
 
 class NeutronCCContext(context.NeutronContext):
-    interfaces = []
+    interfaces = ['quantum-network-service', 'neutron-network-service']
 
     @property
     def plugin(self):

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-09-24 16:29:26 +0000
+++ hooks/nova_cc_hooks.py	2015-10-08 13:31:32 +0000
@@ -26,6 +26,7 @@
     related_units,
     open_port,
     unit_get,
+    status_set,
 )
 
 from charmhelpers.core.host import (
@@ -49,7 +50,8 @@
     openstack_upgrade_available,
     os_release,
     os_requires_version,
-    sync_db_with_multi_ipv6_addresses
+    sync_db_with_multi_ipv6_addresses,
+    set_os_workload_status,
 )
 
 from charmhelpers.contrib.openstack.neutron import (
@@ -101,6 +103,8 @@
     guard_map,
     get_topics,
     setup_ipv6,
+    REQUIRED_INTERFACES,
+    check_optional_relations,
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
@@ -146,9 +150,11 @@
 
 @hooks.hook('install.real')
 def install():
+    status_set('maintenance', 'Executing pre-install')
     execd_preinstall()
     configure_installation_source(config('openstack-origin'))
 
+    status_set('maintenance', 'Installing apt packages')
     apt_update()
     apt_install(determine_packages(), fatal=True)
 
@@ -162,7 +168,9 @@
                 log('Installing %s to /usr/bin' % f)
                 shutil.copy2(f, '/usr/bin')
     [open_port(port) for port in determine_ports()]
-    log('Disabling services into db relation joined')
+    msg = 'Disabling services into db relation joined'
+    log(msg)
+    status_set('maintenance', msg)
     disable_services()
     cmd_all_services('stop')
 
@@ -173,6 +181,7 @@
 @restart_on_change(restart_map(), stopstart=True)
 def config_changed():
     if config('prefer-ipv6'):
+        status_set('maintenance', 'configuring ipv6')
         setup_ipv6()
         sync_db_with_multi_ipv6_addresses(config('database'),
                                           config('database-user'),
@@ -180,10 +189,12 @@
 
     global CONFIGS
     if git_install_requested():
+        status_set('maintenance', 'Running Git install')
         if config_value_changed('openstack-origin-git'):
             git_install(config('openstack-origin-git'))
     elif not config('action-managed-upgrade'):
         if openstack_upgrade_available('nova-common'):
+            status_set('maintenance', 'Running openstack upgrade')
             CONFIGS = do_openstack_upgrade(CONFIGS)
             [neutron_api_relation_joined(rid=rid, remote_restart=True)
                 for rid in relation_ids('neutron-api')]
@@ -192,6 +203,7 @@
     CONFIGS.write_all()
     if console_attributes('protocol'):
         if not git_install_requested():
+            status_set('maintenance', 'Configuring guest console access')
             apt_update()
             packages = console_attributes('packages') or []
             filtered = filter_installed_packages(packages)
@@ -244,6 +256,7 @@
         log('Not running neutron database migration as migrations are by '
             'the neutron-api charm.')
     else:
+        status_set('maintenance', 'Running neutron db migration')
         migrate_neutron_database()
         # neutron-api service may have appeared while the migration was
         # running so prod it just in case
@@ -330,6 +343,7 @@
         # permitted units then check if we're in the list.
         allowed_units = relation_get('nova_allowed_units')
         if allowed_units and local_unit() in allowed_units.split():
+            status_set('maintenance', 'Running nova db migration')
             migrate_nova_database()
             log('Triggering remote cloud-compute restarts.')
             [compute_joined(rid=rid, remote_restart=True)
@@ -354,6 +368,7 @@
     CONFIGS.write_all()
 
     if is_elected_leader(CLUSTER_RES):
+        status_set('maintenance', 'Running nova db migration')
         migrate_nova_database()
         log('Triggering remote cloud-compute restarts.')
         [compute_joined(rid=rid, remote_restart=True)
@@ -578,6 +593,7 @@
     if 'migration_auth_type' not in rel_settings:
         return
     if rel_settings['migration_auth_type'] == 'ssh':
+        status_set('maintenance', 'configuring live migration')
         key = rel_settings.get('ssh_public_key')
         if not key:
             log('SSH migration set but peer did not publish key.')
@@ -1039,7 +1055,8 @@
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
         log('Unknown hook {} - skipping.'.format(e))
-
+    set_os_workload_status(CONFIGS, REQUIRED_INTERFACES,
+                           charm_func=check_optional_relations)
 
 if __name__ == '__main__':
     main()

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2015-10-06 15:47:35 +0000
+++ hooks/nova_cc_utils.py	2015-10-08 13:31:32 +0000
@@ -11,7 +11,10 @@
 from charmhelpers.contrib.openstack.neutron import (
     network_manager, neutron_plugin_attribute)
 
-from charmhelpers.contrib.hahelpers.cluster import is_elected_leader
+from charmhelpers.contrib.hahelpers.cluster import (
+    is_elected_leader,
+    get_hacluster_config,
+)
 
 from charmhelpers.contrib.peerstorage import peer_store
 
@@ -31,7 +34,9 @@
     git_yaml_value,
     is_ip,
     os_release,
-    save_script_rc as _save_script_rc)
+    save_script_rc as _save_script_rc,
+    set_os_workload_status,
+)
 
 from charmhelpers.fetch import (
     apt_upgrade,
@@ -50,6 +55,7 @@
     is_relation_made,
     INFO,
     ERROR,
+    status_get,
 )
 
 from charmhelpers.core.host import (
@@ -80,6 +86,16 @@
 
 CLUSTER_RES = 'grp_nova_vips'
 
+# The interface is said to be satisfied if anyone of the interfaces in the
+# list has a complete context.
+REQUIRED_INTERFACES = {
+    'database': ['shared-db', 'pgsql-db'],
+    'messaging': ['amqp', 'zeromq-configuration'],
+    'identity': ['identity-service'],
+    'image': ['image-service'],
+    'compute': ['nova-compute'],
+}
+
 # removed from original: charm-helper-sh
 BASE_PACKAGES = [
     'apache2',
@@ -195,7 +211,8 @@
                      nova_cc_context.NeutronCCContext(),
                      nova_cc_context.NovaConfigContext(),
                      nova_cc_context.InstanceConsoleContext(),
-                     nova_cc_context.ConsoleSSLContext()],
+                     nova_cc_context.ConsoleSSLContext(),
+                     nova_cc_context.CloudComputeContext()],
     }),
     (NOVA_API_PASTE, {
         'services': [s for s in BASE_SERVICES if 'api' in s],
@@ -1328,3 +1345,26 @@
 
     apt_update()
     apt_install(LATE_GIT_PACKAGES, fatal=True)
+
+
+def check_optional_relations(configs):
+    required_interfaces = {}
+    if relation_ids('ha'):
+        required_interfaces['ha'] = ['cluster']
+        try:
+            get_hacluster_config()
+        except:
+            return ('blocked',
+                    'hacluster missing configuration: '
+                    'vip, vip_iface, vip_cidr')
+    if relation_ids('quantum-network-service'):
+        required_interfaces['quantum'] = ['quantum-network-service']
+    if relation_ids('cinder-volume-service'):
+        required_interfaces['cinder'] = ['cinder-volume-service']
+    if relation_ids('neutron-api'):
+        required_interfaces['neutron-api'] = ['neutron-api']
+    if required_interfaces:
+        set_os_workload_status(configs, required_interfaces)
+        return status_get()
+    else:
+        return 'unknown', 'No optional relations'

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
--- tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-09-22 02:07:16 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-10-08 13:31:32 +0000
@@ -752,7 +752,7 @@
             self.log.debug('SSL is enabled  @{}:{} '
                            '({})'.format(host, port, unit_name))
             return True
-        elif not port and not conf_ssl:
+        elif not conf_ssl:
             self.log.debug('SSL not enabled @{}:{} '
                            '({})'.format(host, port, unit_name))
             return False

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-09-24 16:29:26 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-10-08 13:31:32 +0000
@@ -73,6 +73,7 @@
     'update_nrpe_config',
     'git_install',
     'git_install_requested',
+    'status_set',
 ]
 
 

=== modified file 'unit_tests/test_utils.py'
--- unit_tests/test_utils.py	2015-05-22 15:31:25 +0000
+++ unit_tests/test_utils.py	2015-10-08 13:31:32 +0000
@@ -6,6 +6,9 @@
 from contextlib import contextmanager
 from mock import patch, MagicMock
 
+patch('charmhelpers.contrib.openstack.utils.set_os_workload_status').start()
+patch('charmhelpers.core.hookenv.status_set').start()
+
 
 def load_config():
     '''