Merge lp:~plumgrid-team/charms/trusty/neutron-api-plumgrid/trunk into lp:charms/trusty/neutron-api-plumgrid

[Bilal Baqar]

Needs sync

[Bilal Baqar (bbaqar)]

tests/files/plumgrid-edge-dense.yaml and tests/tests.yaml in both branches are identical. Dont know the reason for the conflict. Please resolve it before merging.

[lp:~plumgrid-team/charms/trusty/neutron-api-plumgrid/trunk]

13. By Bilal Baqar on 2016-03-14

1. Updating plumlib.ini
2. Removed package removal from stop hook

14. By Bilal Baqar on 2016-03-25

Improved config-changed hook to perform steps according to the config changed

15. By Bilal Baqar on 2016-04-01

db-migration for specific networking-plumgrid versions

16. By Bilal Baqar on 2016-04-08

Adding status messages in charms - Ticket:[SOL-949]

17. By Bilal Baqar on 2016-04-08

Revision update

18. By Bilal Baqar on 2016-04-08

Updated readme

19. By Bilal Baqar on 2016-04-25

Merge: Liberty/Mitaka support

20. By Bilal Baqar on 2016-05-18

Merge: Mitaka support added
- L2 Vtep and ECMP support added
- pip proxy option added
- removed unused charmhelpers modules
- synced latest charmhelpers modules
- updated charm-helpers-sync.yaml
- added connected type config
- getting pg vip and creds from director relation

21. By Bilal Baqar on 2016-05-28

user-domain-name config added
configure-pg-sources function added

22. By Junaid Ali on 2016-06-04

Resynced charm-helpers

23. By Junaid Ali on 2016-06-21

Changes:
 Added config project_domain_name in plumlib.ini for keystone version v3.

 Ticket: [SOL-1105]

Unmerged revisions

=== modified file 'Makefile'
--- Makefile	2015-08-24 16:27:30 +0000
+++ Makefile	2016-04-08 15:23:08 +0000
@@ -7,7 +7,7 @@
         netaddr jinja2
 
 lint: virtualenv
-	.venv/bin/flake8 --exclude hooks/charmhelpers hooks unit_tests tests
+	.venv/bin/flake8 --exclude hooks/charmhelpers hooks unit_tests tests --ignore E402
 	@charm proof
 
 unit_test: virtualenv

=== modified file 'README.md'
--- README.md	2015-09-01 02:50:53 +0000
+++ README.md	2016-04-08 15:23:08 +0000
@@ -44,4 +44,3 @@
 # Contact Information
 
 Bilal Baqar <[e-mail]>
-Bilal Ahmad <[e-mail]>

=== modified file 'config.yaml'
--- config.yaml	2015-07-29 18:35:16 +0000
+++ config.yaml	2016-04-08 15:23:08 +0000
@@ -11,3 +11,13 @@
     default: null
     type: string
     description: Provide the respective keys of the install sources
+  plumgrid-build:
+    default: 'latest'
+    type: string
+    description: |
+       Provide the build version of PLUMgrid packages that needs to be installed
+  networking-plumgrid-version:
+    default: null
+    type: string
+    description: |
+       Provide the version of networking-plumgrid package that needs to be installed

=== modified file 'hooks/neutron_plumgrid_hooks.py'
--- hooks/neutron_plumgrid_hooks.py	2015-08-09 15:32:44 +0000
+++ hooks/neutron_plumgrid_hooks.py	2016-04-08 15:23:08 +0000
@@ -6,22 +6,24 @@
 # in this file.
 
 import sys
-
+from charmhelpers.core.host import service_running
 from charmhelpers.core.hookenv import (
     Hooks,
     UnregisteredHookError,
     log,
+    config,
+    status_set
 )
 
 from charmhelpers.core.host import (
     restart_on_change,
+    service_restart
 )
 
 from charmhelpers.fetch import (
     apt_install,
     apt_update,
     configure_sources,
-    apt_purge,
 )
 
 from neutron_plumgrid_utils import (
@@ -40,23 +42,37 @@
     '''
     Install hook is run when the charm is first deployed on a node.
     '''
+    status_set('maintenance', 'Executing pre-install')
     configure_sources()
+    status_set('maintenance', 'Installing apt packages')
     apt_update()
-    apt_install(determine_packages(), options=['--force-yes'], fatal=True)
+    pkgs = determine_packages()
+    for pkg in pkgs:
+        apt_install(pkg, options=['--force-yes'], fatal=True)
     ensure_files()
 
 
 @hooks.hook('config-changed')
+@restart_on_change(restart_map())
 def config_changed():
     '''
     This hook is run when a config parameter is changed.
     It also runs on node reboot.
     '''
-    stop()
-    configure_sources()
-    apt_update()
-    apt_install(determine_packages(), options=['--force-yes'], fatal=True)
-    ensure_files()
+    charm_config = config()
+    if (charm_config.changed('install_sources') or
+        charm_config.changed('plumgrid-build') or
+            charm_config.changed('install_keys')):
+        status_set('maintenance', 'Upgrading apt packages')
+        configure_sources()
+        apt_update()
+        pkgs = determine_packages()
+        for pkg in pkgs:
+            apt_install(pkg, options=['--force-yes'], fatal=True)
+        service_restart('neutron-server')
+    if charm_config.changed('networking-plumgrid-version'):
+        ensure_files()
+        service_restart('neutron-server')
     CONFIGS.write_all()
 
 
@@ -78,9 +94,15 @@
     '''
     This hook is run when the charm is destroyed.
     '''
-    pkgs = determine_packages()
-    for pkg in pkgs:
-        apt_purge(pkg, fatal=False)
+    log('Charm stopping without removal of packages')
+
+
[e-mail]('update-status')
+def update_status():
+    if service_running('neutron-server'):
+        status_set('active', 'Unit is ready')
+    else:
+        status_set('blocked', 'neutron server not running')
 
 
 def main():

=== modified file 'hooks/neutron_plumgrid_utils.py'
--- hooks/neutron_plumgrid_utils.py	2015-07-29 18:35:16 +0000
+++ hooks/neutron_plumgrid_utils.py	2016-04-08 15:23:08 +0000
@@ -8,11 +8,17 @@
 import os
 from charmhelpers.contrib.openstack import templating
 from charmhelpers.contrib.python.packages import pip_install
-
+from charmhelpers.fetch import (
+    apt_cache
+)
+from charmhelpers.core.hookenv import (
+    config,
+    is_leader
+)
 from charmhelpers.contrib.openstack.utils import (
     os_release,
 )
-
+import subprocess
 import neutron_plumgrid_context
 
 TEMPLATES = 'templates/'
@@ -37,13 +43,32 @@
     }),
 ])
 
+NETWORKING_PLUMGRID_VERSION = OrderedDict([
+    ('kilo', '2015.1.1.1'),
+    ('liberty', '2015.2.1.1'),
+])
+
 
 def determine_packages():
     '''
     Returns list of packages required to be installed alongside neutron to
     enable PLUMgrid in Openstack.
     '''
-    return list(set(PG_PACKAGES))
+    pkgs = []
+    tag = config('plumgrid-build')
+    for pkg in PG_PACKAGES:
+        if tag == 'latest':
+            pkgs.append(pkg)
+        else:
+            if tag in [i.ver_str for i in apt_cache()[pkg].version_list]:
+                pkgs.append('%s=%s' % (pkg, tag))
+            else:
+                error_msg = \
+                    "Build version '%s' for package '%s' not available" \
+                    % (tag, pkg)
+                raise ValueError(error_msg)
+    # return list(set(PG_PACKAGES))
+    return pkgs
 
 
 def resource_map():
@@ -61,6 +86,9 @@
     the context required for all templates of this charm.
     '''
     release = release or os_release('neutron-server', base='kilo')
+    if release < 'kilo':
+        raise ValueError('OpenStack %s release not supported' % release)
+
     configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
                                           openstack_release=release)
     for cfg, rscs in resource_map().iteritems():
@@ -82,5 +110,27 @@
     '''
     Ensures PLUMgrid specific files exist before templates are written.
     '''
-    pip_install('networking-plumgrid', fatal=True)
+    install_networking_plumgrid()
     os.chmod('/etc/sudoers.d/neutron_sudoers', 0o440)
+
+
+def install_networking_plumgrid():
+    '''
+    Installs networking-plumgrid package
+    '''
+    release = os_release('neutron-server', base='kilo')
+    if config('networking-plumgrid-version') is None:
+        package_version = NETWORKING_PLUMGRID_VERSION[release]
+    else:
+        package_version = config('networking-plumgrid-version')
+    package_name = 'networking-plumgrid==%s' % package_version
+    pip_install(package_name, fatal=True)
+    if is_leader() and package_version != '2015.1.1.1':
+        migrate_neutron_db()
+
+
+def migrate_neutron_db():
+    release = os_release('neutron-common', base='kilo')
+    cmd = [('plumgrid-db-manage' if release == 'kilo'
+            else 'neutron-db-manage'), 'upgrade', 'heads']
+    subprocess.check_output(cmd)

=== added symlink 'hooks/update-status'
=== target is u'neutron_plumgrid_hooks.py'
=== modified file 'templates/kilo/plumlib.ini'
--- templates/kilo/plumlib.ini	2015-08-09 15:32:44 +0000
+++ templates/kilo/plumlib.ini	2016-04-08 15:23:08 +0000
@@ -46,10 +46,14 @@
 api_key = 162-22O8BEYWO0DQGIM
 secret_key = 171de423af844bad400a98ea5b9fa56d
 
+[ConnectorType]
+connector_type = distributed
+
 {% if admin_user -%}
 [keystone_authtoken]
 admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
 admin_tenant_name = {{ admin_tenant_name }}
 auth_uri = {{ service_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0/
+identity_version = v2.0
 {% endif -%}

=== added file 'tests/files/neutron-api-plumgrid-dense.yaml'
--- tests/files/neutron-api-plumgrid-dense.yaml	1970-01-01 00:00:00 +0000
+++ tests/files/neutron-api-plumgrid-dense.yaml	2016-04-08 15:23:08 +0000
@@ -0,0 +1,133 @@
+test:
+  series: 'trusty'
+  relations:
+  - - mysql
+    - keystone
+  - - nova-cloud-controller
+    - mysql
+  - - nova-cloud-controller
+    - rabbitmq-server
+  - - nova-cloud-controller
+    - glance
+  - - nova-cloud-controller
+    - keystone
+  - - nova-compute
+    - nova-cloud-controller
+  - - nova-compute
+    - mysql
+  - - nova-compute
+    - rabbitmq-server
+  - - nova-compute
+    - glance
+  - - glance
+    - mysql
+  - - glance
+    - keystone
+  - - glance
+    - cinder
+  - - mysql
+    - cinder
+  - - cinder
+    - rabbitmq-server
+  - - cinder
+    - nova-cloud-controller
+  - - cinder
+    - keystone
+  - - openstack-dashboard
+    - keystone
+  - - neutron-api
+    - mysql
+  - - neutron-api
+    - keystone
+  - - neutron-api
+    - rabbitmq-server
+  - - neutron-api
+    - nova-cloud-controller
+  - - neutron-api
+    - neutron-api-plumgrid
+  - - neutron-api-plumgrid
+    - plumgrid-edge
+  - - plumgrid-director
+    - plumgrid-edge
+  - - nova-compute
+    - plumgrid-edge
+  - - plumgrid-director
+    - plumgrid-gateway
+  services:
+    mysql:
+      charm: cs:trusty/mysql
+      num_units: 1
+      to: 'lxc:plumgrid-director=0'
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+      num_units: 1
+      to: 'lxc:plumgrid-director=0'
+    keystone:
+      charm: cs:trusty/keystone
+      num_units: 1
+      options:
+        admin-password: plumgrid
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    nova-cloud-controller:
+      charm: cs:trusty/nova-cloud-controller
+      num_units: 1
+      options:
+        console-access-protocol: novnc
+        network-manager: Neutron
+        openstack-origin: cloud:trusty-kilo
+        quantum-security-groups: 'yes'
+      to: 'lxc:plumgrid-director=0'
+    glance:
+      charm: cs:trusty/glance
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    openstack-dashboard:
+      charm: cs:trusty/openstack-dashboard
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    cinder:
+      charm: cs:trusty/cinder
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    neutron-api:
+      charm: cs:~plumgrid-team/trusty/neutron-api
+      num_units: 1
+      options:
+        neutron-plugin: plumgrid
+        neutron-security-groups: false
+        openstack-origin: cloud:trusty-kilo
+        plumgrid-password: plumgrid
+        plumgrid-username: plumgrid
+        plumgrid-virtual-ip: 192.168.100.250
+      to: 'lxc:plumgrid-director=0'
+    neutron-api-plumgrid:
+      charm: cs:~plumgrid-team/trusty/neutron-api-plumgrid
+      options:
+        enable-metadata: True
+    plumgrid-director:
+      charm: cs:~plumgrid-team/trusty/plumgrid-director
+      num_units: 1
+      constraints: "root-disk=30000 cpu-cores=8 mem=8G"
+      options:
+        plumgrid-virtual-ip: 192.168.100.250
+    nova-compute:
+      charm: cs:~plumgrid-team/trusty/nova-compute
+      num_units: 1
+      options:
+        enable-live-migration: true
+        enable-resize: true
+        migration-auth-type: ssh
+        openstack-origin: cloud:trusty-kilo
+      to: '0'
+    plumgrid-edge:
+      charm: cs:~plumgrid-team/trusty/plumgrid-edge
+    plumgrid-gateway:
+      charm: cs:~plumgrid-team/trusty/plumgrid-gateway
+      num_units: 1

=== renamed file 'tests/files/neutron-api-plumgrid-dense.yaml' => 'tests/files/neutron-api-plumgrid-dense.yaml.moved'
=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2016-04-08 15:23:08 +0000
@@ -0,0 +1,3 @@
+makefile:
+  - lint
+

=== renamed file 'tests/tests.yaml' => 'tests/tests.yaml.moved'
=== modified file 'unit_tests/test_neutron_plumgrid_plugin_hooks.py'
--- unit_tests/test_neutron_plumgrid_plugin_hooks.py	2015-08-09 15:32:44 +0000
+++ unit_tests/test_neutron_plumgrid_plugin_hooks.py	2016-04-08 15:23:08 +0000
@@ -19,11 +19,11 @@
 TO_PATCH = [
     'configure_sources',
     'apt_update',
-    'apt_purge',
     'apt_install',
     'CONFIGS',
     'ensure_files',
     'stop',
+    'determine_packages',
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"
 
@@ -42,6 +42,7 @@
 
     def test_install_hook(self):
         _pkgs = ['plumgrid-pythonlib']
+        self.determine_packages.return_value = [_pkgs]
         self._call_hook('install')
         self.configure_sources.assert_called_with()
         self.apt_update.assert_called_with()
@@ -51,19 +52,6 @@
         ])
         self.ensure_files.assert_called_with()
 
-    def test_config_changed_hook(self):
-        _pkgs = ['plumgrid-pythonlib']
-        self._call_hook('config-changed')
-        self.stop.assert_called_with()
-        self.configure_sources.assert_called_with()
-        self.apt_update.assert_called_with()
-        self.apt_install.assert_has_calls([
-            call(_pkgs, fatal=True,
-                 options=['--force-yes']),
-        ])
-        self.ensure_files.assert_called_with()
-        self.CONFIGS.write_all.assert_called_with()
-
     def test_neutron_api_joined(self):
         self._call_hook('neutron-plugin-api-relation-joined')
         self.ensure_files.assert_called_with()
@@ -73,10 +61,3 @@
         self._call_hook('container-relation-changed')
         self.ensure_files.assert_called_with()
         self.CONFIGS.write_all.assert_called_with()
-
-    def test_stop(self):
-        _pkgs = 'plumgrid-pythonlib'
-        self._call_hook('stop')
-        self.apt_purge.assert_has_calls([
-            call(_pkgs, fatal=False)
-        ])

=== modified file 'unit_tests/test_neutron_plumgrid_plugin_utils.py'
--- unit_tests/test_neutron_plumgrid_plugin_utils.py	2015-07-29 18:35:16 +0000
+++ unit_tests/test_neutron_plumgrid_plugin_utils.py	2016-04-08 15:23:08 +0000
@@ -36,11 +36,6 @@
         # Reset cached cache
         hookenv.cache = {}
 
-    def test_determine_packages(self):
-        pkg_list = nutils.determine_packages()
-        expect = ['plumgrid-pythonlib']
-        self.assertItemsEqual(pkg_list, expect)
-
     def test_register_configs(self):
         class _mock_OSConfigRenderer():
             def __init__(self, templates_dir=None, openstack_release=None):