~hopem/charms/trusty/keystone/fix-ssl-disable

Committer: Edward Hope-Morley
Date: 2015-02-16 13:35:14 UTC
mfrom: (117.1.3 keystone.strbools)
Revision ID: edward.hope-morley@canonical.com-20150216133514-byi9r8zk30a4ffz2

[hopem,r=gnuoy]

Synced charm-helpers to get core.strutils and replaced
str-to-bool logic with bool_from_string()

added added

removed removed

services.append(this_service)

use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',

'ceph-osd', 'ceph-radosgw']

# Openstack subordinate charms do not expose an origin option as that

# is controlled by the principle

ignore = ['neutron-openvswitch']

if self.openstack:

for svc in services:

if svc['name'] not in use_source:

if svc['name'] not in use_source + ignore:

config = {'openstack-origin': self.openstack}

self.d.configure(svc['name'], config)

if self.source:

for svc in services:

if svc['name'] in use_source:

if svc['name'] in use_source and svc['name'] not in ignore:

config = {'source': self.source}

self.d.configure(svc['name'], config)