Merge lp:~ivoks/charms/precise/nova-cloud-controller/alchemy-flags into lp:~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk

[Marco Ceppi]

This branch makes it possible to define sqlalchemy flags within [DATABASE] section of quantum/neutron agent plugins. This is commonly used to fine tune SQL access.

[Marco Ceppi (marcoceppi)]

Deferring to openstack-charmers

review: Abstain

[James Page (james-page)]

I'm assuming that this is tune things like database pool sizing, timeouts etc?

I'd actually prefer to see that exposed via specific configuration options rather than being generic - this also feels like something we should have more sane default for - I'm assuming we can make a max pool size and lazy fill it as and when required?

review: Needs Information

[Ante Karamatić (ivoks)]

Correct, it's only for database tuning.

While I agree that having better defaults would help a lot, I'm pretty sure some people would find this useful. This is oriented to devops that understand how this impacts neutron. I deliberately used 'sqlalchemy' instead of 'database' in the name, to target people who actually do understand what sqlaclchemy is.

I took the same approach we have for nova.conf. We allow various configuration flags to be set for nova, but none for neutron.

[lp:~ivoks/charms/precise/nova-cloud-controller/alchemy-flags]

63. By Ante Karamatić on 2014-04-18

Rebased on latest nova-c-c charm

[Haw Loeung (hloeung)]

Hi,

IS is very interested in getting this change merged upstream. We need to be able to tune pool size and overflow.

[Haw Loeung (hloeung)]

MP:219952 to fix the missing config type.

[Haw Loeung (hloeung)]

err. MP#219952 https://code.launchpad.net/~hloeung/charms/trusty/nova-cloud-controller/fix-neutron-alchemy-config/+merge/219952

[Edward Hope-Morley (hopem)]

Gonna rebase onto <next>. Will resubmit.

review: Needs Fixing

[Edward Hope-Morley (hopem)]

New up-to-date branch based in /next here lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022. Will submit new MP.

review: Disapprove

Unmerged revisions

63. By Ante Karamatić on 2014-04-18

Rebased on latest nova-c-c charm

62. By Ante Karamatić on 2014-01-30

Bump revision

61. By Ante Karamatić on 2014-01-30

Add neutron-alchemy-flags functionality to nova-c-c charm

60. By Ante Karamatić on 2014-01-30

Add functionality to charm-helpers from:
  lp:~ivoks/charm-helpers/neutron-alchemy

59. By Ante Karamatić on 2014-01-30

Sync charmhelpers

=== modified file 'config.yaml'
--- config.yaml	2014-04-16 08:47:14 +0000
+++ config.yaml	2014-04-18 09:05:01 +0000
@@ -126,6 +126,11 @@
   ssl_key:
     type: string
     description: SSL key to use with certificate specified as ssl_cert.
+  neutron-alchemy-flags:
+    default: None
+    type: string
+      Comma separated list of key=value sqlalchemy related config flags to be
+      set in plugin ini file.
   ssl_ca:
     type: string
     description: |

=== modified file 'revision'
--- revision	2014-04-16 08:25:14 +0000
+++ revision	2014-04-18 09:05:01 +0000
@@ -1,1 +1,1 @@
-315
+316

=== modified file 'templates/folsom/ovs_quantum_plugin.ini'
--- templates/folsom/ovs_quantum_plugin.ini	2014-04-16 08:25:14 +0000
+++ templates/folsom/ovs_quantum_plugin.ini	2014-04-18 09:05:01 +0000
@@ -16,6 +16,11 @@
 {% else -%}
 connection = sqlite:////var/lib/quantum/quantum.sqlite
 {% endif -%}
+{% if neutron_alchemy_flags -%}
+{% for key, value in neutron_alchemy_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 
 [SECURITYGROUP]
 {% if neutron_security_groups -%}

=== modified file 'templates/parts/section-database'
--- templates/parts/section-database	2014-03-31 11:56:09 +0000
+++ templates/parts/section-database	2014-04-18 09:05:01 +0000
@@ -2,3 +2,8 @@
 [database]
 connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
 {% endif -%}
+{% if neutron_alchemy_flags -%}
+{% for key, value in neutron_alchemy_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}