Juju Charms Collection
nova-cloud-controller package

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

  1. Trusty Tahr (14.04)
  2. next.lp1273022
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Superseded
Proposed branch: lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 35 lines (+11/-1)
3 files modified
config.yaml (+5/-0)
revision (+1/-1)
templates/parts/section-database (+5/-0)
To merge this branch: bzr merge lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Haw Loeung Pending
Review via email: mp+234516@code.launchpad.net

This proposal supersedes a proposal from 2014-07-16.

This proposal has been superseded by a proposal from 2014-10-10.

To post a comment you must log in.
Revision history for this message
James Page (james-page) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Edward Hope-Morley (hopem) wrote : Posted in a previous version of this proposal

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.

Revision history for this message
James Page (james-page) wrote :

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
Revision history for this message
Edward Hope-Morley (hopem) wrote :

@jamespage fixed.

lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022 updated
91. By Edward Hope-Morley

trunk sync

92. By Edward Hope-Morley

fixed review comments

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-10-06 21:01:49 +0000
3+++ config.yaml 2014-10-06 22:08:14 +0000
4@@ -139,6 +139,11 @@
5 type: string
6 default:
7 description: SSL key to use with certificate specified as ssl_cert.
8+ neutron-alchemy-flags:
9+ type: string
10+ description: |
11+ Comma separated list of key=value sqlalchemy related config flags to be
12+ set in plugin ini file.
13 ssl_ca:
14 type: string
15 default:
16
17=== modified file 'revision'
18--- revision 2014-04-25 16:46:42 +0000
19+++ revision 2014-10-06 22:08:14 +0000
20@@ -1,1 +1,1 @@
21-500
22+501
23
24=== modified file 'templates/parts/section-database'
25--- templates/parts/section-database 2014-05-02 09:21:30 +0000
26+++ templates/parts/section-database 2014-10-06 22:08:14 +0000
27@@ -2,3 +2,8 @@
28 [database]
29 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 %}
30 {% endif -%}
31+{% if neutron_alchemy_flags -%}
32+{% for key, value in neutron_alchemy_flags.iteritems() -%}
33+{{ key }} = {{ value }}
34+{% endfor -%}
35+{% endif -%}

Subscribers

People subscribed via source and target branches