Merge lp:~niedbalski/charms/trusty/quantum-gateway/fix-lp-1396607 into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[Jorge Niedbalski]

Fix for LP: #1396607

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

UOSCI bot says:
charm_lint_check #1226 quantum-gateway-next for niedbalski mp242926
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option sysctl has no default value
  I: config.yaml: option os-data-network has no default value
  I: config.yaml: option data-port has no default value
  I: config.yaml: option instance-mtu has no default value
  I: config.yaml: option external-network-id has no default value

Full lint test output: http://paste.ubuntu.com/9252804/
Build: http://10.98.191.181:8080/job/charm_lint_check/1226/

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

UOSCI bot says:
charm_unit_test #1060 quantum-gateway-next for niedbalski mp242926
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/quantum_hooks 108 2 98% 204-206
  hooks/quantum_utils 207 1 99% 389
  TOTAL 458 9 98%
  Ran 85 tests in 3.389s
  OK

Full unit test output: http://paste.ubuntu.com/9252807/
Build: http://10.98.191.181:8080/job/charm_unit_test/1060/

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

UOSCI bot says:
charm_amulet_test #529 quantum-gateway-next for niedbalski mp242926
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9253062/
Build: http://10.98.191.181:8080/job/charm_amulet_test/529/

[Billy Olsen (billy-olsen)]

LGTM. Per our conversation niedbalski, it may be nice to have this integrated into one of the contexts so we can apply it throughout the openstack charms.

review: Approve

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

charm_lint_check #91 quantum-gateway-next for niedbalski mp242926
    LINT OK: passed

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

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

charm_unit_test #124 quantum-gateway-next for niedbalski mp242926
    UNIT OK: passed

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

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

charm_amulet_test #70 quantum-gateway-next for niedbalski mp242926
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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

charm_lint_check #311 quantum-gateway-next for niedbalski mp245194
    LINT OK: passed

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

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

charm_unit_test #339 quantum-gateway-next for niedbalski mp245194
    UNIT OK: passed

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

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

charm_amulet_test #474 quantum-gateway-next for niedbalski mp245194
    AMULET OK: passed

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

[Edward Hope-Morley (hopem)]

lgtm +1

review: Approve

[Billy Olsen (billy-olsen)]

LGTM as well

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-11-24 09:34:05 +0000
+++ config.yaml	2014-12-19 13:39:13 +0000
@@ -92,7 +92,7 @@
       accomodate the packet overhead of using GRE tunnels.
   enable-l3-agent:
     type: boolean
-    default: True 
+    default: True
     description: |
       Optional configuration to support use of linux router
       Note that this is used only for Cisco n1kv plugin.
@@ -115,3 +115,9 @@
       .
       This network will be used for tenant network traffic in overlay
       networks.
+  sysctl:
+    type: string
+    default:
+    description: |
+      YAML formatted associative array of sysctl values, e.g.:
+        '{ kernel.pid_max : 4194303 }'
\ No newline at end of file

=== modified file 'hooks/quantum_hooks.py'
--- hooks/quantum_hooks.py	2014-12-17 17:34:33 +0000
+++ hooks/quantum_hooks.py	2014-12-19 13:39:13 +0000
@@ -33,6 +33,7 @@
     openstack_upgrade_available,
 )
 from charmhelpers.payload.execd import execd_preinstall
+from charmhelpers.core.sysctl import create as create_sysctl
 
 import sys
 from quantum_utils import (
@@ -78,6 +79,11 @@
     global CONFIGS
     if openstack_upgrade_available(get_common_package()):
         CONFIGS = do_openstack_upgrade()
+
+    sysctl_dict = config('sysctl')
+    if sysctl_dict:
+        create_sysctl(sysctl_dict, '/etc/sysctl.d/50-quantum-gateway.conf')
+
     # Re-run joined hooks as config might have changed
     for r_id in relation_ids('shared-db'):
         db_joined(relation_id=r_id)

=== modified file 'unit_tests/test_quantum_hooks.py'
--- unit_tests/test_quantum_hooks.py	2014-11-19 03:09:34 +0000
+++ unit_tests/test_quantum_hooks.py	2014-12-19 13:39:13 +0000
@@ -40,7 +40,8 @@
     'lsb_release',
     'stop_services',
     'b64decode',
-    'is_relation_made'
+    'is_relation_made',
+    'create_sysctl',
 ]
 
 
@@ -98,6 +99,7 @@
     def test_config_changed(self):
         def mock_relids(rel):
             return ['relid']
+        self.test_config.set('sysctl', '{ kernel.max_pid: "1337"}')
         self.openstack_upgrade_available.return_value = True
         self.valid_plugin.return_value = True
         self.relation_ids.side_effect = mock_relids
@@ -112,6 +114,7 @@
         self.assertTrue(_pgsql_db_joined.called)
         self.assertTrue(_amqp_joined.called)
         self.assertTrue(_amqp_nova_joined.called)
+        self.create_sysctl.assert_called()
 
     def test_config_changed_upgrade(self):
         self.openstack_upgrade_available.return_value = True