~tribaal/charms/trusty/nova-cloud-controller/sync-charm-helpers

Committer: James Page
Date: 2014-02-26 14:23:28 UTC
mfrom: <a title="Merged From 66.1.3" href="/~tribaal/charms/trusty/nova-cloud-controller/sync-charm-helpers/revision/66.1.3">(66.1.3 nova-cloud-controller.lp1273469)
Revision ID: james.page@canonical.com-20140226142328-yf3iiq0jde9qxums

[hopem,r=james-page,t=hopem]

Fixup handling on neutron_url for https and clustered configurations.

added added

removed removed

keyring = /etc/ceph/$cluster.$name.keyring

mon host = {{ mon_hosts }}

{% endif -%}

log to syslog = {{ use_syslog }}

err to syslog = {{ use_syslog }}

clog to syslog = {{ use_syslog }}