Merge lp:~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support into lp:~celebdor/charms/trusty/neutron-agents-midonet/split

[James Page]

[lp:~james-page/charms/trusty/neutron-agents-midonet/nova-metadata-support]

43. By James Page on 2016-02-04

Add missing templates and hooks

44. By James Page on 2016-02-04

Don't pickup test unitdatadb file in the real charm

=== modified file '.bzrignore'
--- .bzrignore	2015-08-06 23:20:27 +0000
+++ .bzrignore	2016-02-04 11:45:48 +0000
@@ -4,3 +4,4 @@
 tags
 .venv2
 .venv3
+.unit-state.db

=== modified file 'config.yaml'
--- config.yaml	2016-01-28 00:53:03 +0000
+++ config.yaml	2016-02-04 11:45:48 +0000
@@ -65,10 +65,6 @@
     description: |
       The Midokura Enterprise MidoNet password credentials to access the
       repository.
-  shared-secret:
-    type: string
-    default: ""
-    description: nova-api metadata API and neutron-metada-agent shared secret
   rabbit-user:
     default: neutronagents
     type: string

=== modified file 'hooks/install'
--- hooks/install	2016-01-28 23:34:39 +0000
+++ hooks/install	2016-02-04 11:45:48 +0000
@@ -45,7 +45,8 @@
     puppet.module_install('midonet-midonet')
     hookenv.status_set('maintenance', 'Installing packages')
     fetch.apt_update()
-    fetch.apt_install(['neutron-dhcp-agent',
+    fetch.apt_install(['nova-api-metadata',
+                       'neutron-dhcp-agent',
                        'neutron-metadata-agent',
                        'python-augeas',
                        'python-jinja2'], fatal=True)

=== modified file 'hooks/services.py'
--- hooks/services.py	2016-01-28 01:13:21 +0000
+++ hooks/services.py	2016-02-04 11:45:48 +0000
@@ -18,6 +18,7 @@
 from charmhelpers.contrib.openstack import utils
 from charmhelpers.core import hookenv
 from charmhelpers.core import host
+from charmhelpers.core import unitdata
 from charmhelpers.core.services import base
 from charmhelpers.core.services import helpers
 from midonet_helpers import puppet
@@ -28,42 +29,62 @@
 TEMPLATES = 'templates/'
 
 
-class Config(dict):
+def get_shared_secret():
+    db = unitdata.kv()
+    if not db.get('shared-secret'):
+        db.set('shared-secret', host.pwgen(32))
+        db.flush()
+    return db.get('shared-secret')
+
+
+class Charm(dict):
     def __init__(self, *args):
         self['config'] = hookenv.config()
+        self['unit'] = {
+            'shared-secret': get_shared_secret()
+        }
 
 
 class OSTRenderer(base.ManagerCallback):
-    def __init__(self, amqp_ctxt, release=None):
+    def __init__(self, dest, ctxts, release=None):
         release = release or utils.os_release('neutron-common')
         self._configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
                                                     openstack_release=release)
-        self._configs.register('/etc/neutron/neutron.conf', [amqp_ctxt])
+        self._configs.register(dest, ctxts)
 
     def __call__(self, manager, service_name, event_name):
         self._configs.write_all()
 
 
+class MidonetNetworkServiceContext(context.NetworkServiceContext):
+
+    def __call__(self):
+        ctxt = super(MidonetNetworkServiceContext, self).__call__()
+        ctxt['shared_secret'] = get_shared_secret()
+        return ctxt
+
+
 def manage():
     nova = relations.NovaRelation()
-    config = Config()
+    charm = Charm()
     hookenv.status_set('maintenance', 'reconfiguring charm')
-    ost_origin = config['config'].get('openstack-origin')
-    midonet_origin = config['config'].get('midonet-origin')
+    ost_origin = charm['config'].get('openstack-origin')
+    midonet_origin = charm['config'].get('midonet-origin')
     if None in (ost_origin, midonet_origin):
         hookenv.status_set('maintenance', 'Lacking repository configuration')
         return
     ost_release = utils.get_os_codename_install_source(ost_origin)
     try:
         repo = repositories.config('%s/%s' % (ost_release, midonet_origin),
-                                   config['config'].get('mem-username'),
-                                   config['config'].get('mem-password'))
+                                   charm['config'].get('mem-username'),
+                                   charm['config'].get('mem-password'))
     except ValueError as ver:
         hookenv.status_set('maintenance',
                            'Wrong repository configuration: {}'.format(ver))
         return
 
     amqp = context.AMQPContext()
+    network_service = MidonetNetworkServiceContext(rel_name='neutron_agents')
     midonet = common_relations.MidonetApiRelation()
 
     manager = base.ServiceManager([
@@ -82,12 +103,13 @@
                     target='/etc/neutron/dhcp_agent.ini'),
                 puppet.InstallPackagesCallback(
                     ('python-neutron-plugin-midonet',)),
-                OSTRenderer(amqp),
+                OSTRenderer('/etc/neutron/neutron.conf',
+                            [amqp]),
             ],
         },
         {
             'service': 'neutron-metadata-agent',
-            'required_data': [config,
+            'required_data': [charm,
                               nova],
             'data_ready': [
                 helpers.render_template(
@@ -95,8 +117,18 @@
                     target='/etc/neutron/metadata_agent.ini'),
             ],
         },
+        {
+            'service': 'nova-api-metadata',
+            'required_data': [network_service(),
+                              amqp()],
+            'data_ready': [
+                OSTRenderer('/etc/nova/nova.conf',
+                            [network_service, amqp]),
+            ],
+        },
     ])
     manager.manage()
     if (host.service_running('neutron-dhcp-agent') and
-            host.service_running('neutron-metadata-agent')):
-        hookenv.status_set('active', 'dhcp and metadata agents up and running')
+            host.service_running('neutron-metadata-agent') and
+            host.service_running('nova-api-metadata')):
+        hookenv.status_set('active', 'All nova and neutron agents up and running')

=== added symlink 'hooks/upgrade-charm'
=== target is u'install'
=== added file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	1970-01-01 00:00:00 +0000
+++ templates/juno/nova.conf	2016-02-04 11:45:48 +0000
@@ -0,0 +1,25 @@
+# juno
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+logdir=/var/log/nova
+state_path=/var/lib/nova
+lock_path=/var/lock/nova
+root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
+api_paste_config=/etc/nova/api-paste.ini
+enabled_apis=metadata
+multi_host=True
+neutron_metadata_proxy_shared_secret={{ shared_secret }}
+service_neutron_metadata_proxy=True
+# Access to message bus
+{% include "parts/rabbitmq" %}
+# Access to neutron API services
+network_api_class=nova.network.neutronv2.api.API
+neutron_auth_strategy=keystone
+neutron_url={{ quantum_url }}
+neutron_admin_tenant_name={{ service_tenant }}
+neutron_admin_username={{ service_username }}
+neutron_admin_password={{ service_password }}
+neutron_admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0

=== modified file 'templates/kilo/neutron.conf'
--- templates/kilo/neutron.conf	2016-01-28 00:53:03 +0000
+++ templates/kilo/neutron.conf	2016-02-04 11:45:48 +0000
@@ -1,1 +1,7 @@
+[agent]
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+
+[oslo_concurrency]
+lock_path = $state_path/lock
+
 {% include "section-rabbitmq-oslo" %}

=== added file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/nova.conf	2016-02-04 11:45:48 +0000
@@ -0,0 +1,29 @@
+# kilo
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+logdir=/var/log/nova
+state_path=/var/lib/nova
+root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
+api_paste_config=/etc/nova/api-paste.ini
+enabled_apis=metadata
+multi_host=True
+# Access to neutron API services
+network_api_class=nova.network.neutronv2.api.API
+
+[neutron]
+auth_strategy=keystone
+url={{ quantum_url }}
+admin_tenant_name={{ service_tenant }}
+admin_username={{ service_username }}
+admin_password={{ service_password }}
+admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
+service_metadata_proxy=True
+metadata_proxy_shared_secret={{ shared_secret }}
+
+{% include "section-rabbitmq-oslo" %}
+
+[oslo_concurrency]
+lock_path=/var/lock/nova

=== modified file 'templates/metadata_agent.ini'
--- templates/metadata_agent.ini	2016-01-29 10:25:49 +0000
+++ templates/metadata_agent.ini	2016-02-04 11:45:48 +0000
@@ -9,5 +9,7 @@
 admin_user = {{ neutron_agents[0].service_username }}
 admin_password = {{ neutron_agents[0].service_password }}
 # We run the metadata API server locally
-nova_metadata_ip = {{ neutron_agents[0]['private-address'] }}
-metadata_proxy_shared_secret = {{ config['shared-secret'] }}
+nova_metadata_ip = 127.0.0.1
+nova_metadata_port = 8775
+metadata_proxy_shared_secret = {{ unit['shared-secret'] }}
+cache_url = memory://?default_ttl=5

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-01-28 00:53:03 +0000
+++ tests/basic_deployment.py	2016-02-04 11:45:48 +0000
@@ -65,7 +65,6 @@
                    branch='lp:~celebdor/charms/trusty/neutron-api/liberty',
                    series=self.series)
         self.d.add('nova', charm='nova-cloud-controller',
-               branch='lp:~celebdor/charms/trusty/nova-cloud-controller/trunk',
                units=1, series=self.series)
         self.d.add('glance', charm='glance',
                branch='cs:trusty/glance',

=== modified file 'unit_tests/test_templates.py'
--- unit_tests/test_templates.py	2015-08-06 23:20:27 +0000
+++ unit_tests/test_templates.py	2016-02-04 11:45:48 +0000
@@ -67,7 +67,8 @@
                 'quantum_host': self.nova[13],
                 'quantum_port': self.nova[14],
                 'private-address': self.nova[15]}],
-            'config': {
+            'config': {},
+            'unit': {
                 'shared_secret': '',
             }
         }
@@ -102,10 +103,10 @@
             self.assertEqual(config.get('DEFAULT', 'admin_password'),
                              self.nova[6]),
             self.assertEqual(config.get('DEFAULT', 'nova_metadata_ip'),
-                             self.nova[15]),
+                             '127.0.0.1')
             self.assertEqual(config.get('DEFAULT',
                                         'metadata_proxy_shared_secret'),
-                             self.context['config']['shared_secret']),
+                             self.context['unit']['shared_secret']),
         finally:
             if os.path.exists(temp_path):
                 os.remove(temp_path)