Merge lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Edward Hope-Morley]

[James Page (james-page)]

review: Needs Fixing

[Edward Hope-Morley (hopem)]

Hey James, this was merged a while back into lp:charm-helpers and lp:~openstack-charmers/charm-helpers/stable (revision 114) and since this MP has been around for a while it also looks like the charm-helpers sync was done (by you) in revision 63 of this charm. So all that is left is this bit.

[James Page (james-page)]

I think we cut our losses and just provide this for >= icehouse - please drop the folsom template updates and the associated _utils bits.

review: Needs Fixing

[Edward Hope-Morley (hopem)]

@jamespage fixed.

[lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022]

91. By Edward Hope-Morley on 2014-10-22

trunk sync

92. By Edward Hope-Morley on 2014-10-22

fixed review comments

Unmerged revisions

=== modified file 'config.yaml'
--- config.yaml	2014-10-06 21:01:49 +0000
+++ config.yaml	2014-10-06 22:08:14 +0000
@@ -139,6 +139,11 @@
     type: string
     default:
     description: SSL key to use with certificate specified as ssl_cert.
+  neutron-alchemy-flags:
+    type: string
+    description: |
+      Comma separated list of key=value sqlalchemy related config flags to be
+      set in plugin ini file.
   ssl_ca:
     type: string
     default:
 
=== modified file 'revision'
--- revision	2014-04-25 16:46:42 +0000
+++ revision	2014-10-06 22:08:14 +0000
@@ -1,1 +1,1 @@
-500
+501
 
=== modified file 'templates/parts/section-database'
--- templates/parts/section-database	2014-05-02 09:21:30 +0000
+++ templates/parts/section-database	2014-10-06 22:08:14 +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 -%}