cf-charmers team mailing list archive
-
cf-charmers team
-
Mailing list archive
-
Message #00360
[Merge] lp:~johnsca/charms/trusty/cf-cloud-controller/port-conflicts into lp:~cf-charmers/charms/trusty/cf-cloud-controller/trunk
Cory Johns has proposed merging lp:~johnsca/charms/trusty/cf-cloud-controller/port-conflicts into lp:~cf-charmers/charms/trusty/cf-cloud-controller/trunk.
Requested reviews:
Cloud Foundry Charmers (cf-charmers)
For more details, see:
https://code.launchpad.net/~johnsca/charms/trusty/cf-cloud-controller/port-conflicts/+merge/222668
Resolve port conflicts for cf-cloud-controller
https://codereview.appspot.com/108850044/
--
https://code.launchpad.net/~johnsca/charms/trusty/cf-cloud-controller/port-conflicts/+merge/222668
Your team Cloud Foundry Charmers is requested to review the proposed merge of lp:~johnsca/charms/trusty/cf-cloud-controller/port-conflicts into lp:~cf-charmers/charms/trusty/cf-cloud-controller/trunk.
=== added file 'hooks/cc-relation-changed'
--- hooks/cc-relation-changed 1970-01-01 00:00:00 +0000
+++ hooks/cc-relation-changed 2014-06-10 15:52:03 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# vim: et ai ts=4 sw=4:
+from charmhelpers.core import hookenv
+import config
+
+hookenv.relation_set(
+ hostname=config.API_CONTEXT['api']['hostname'],
+ port=config.API_CONTEXT['api']['port'],
+ user=config.API_CONTEXT['api']['user'],
+ password=config.API_CONTEXT['api']['password'],
+)
=== modified file 'hooks/charmhelpers/contrib/cloudfoundry/contexts.py'
--- hooks/charmhelpers/contrib/cloudfoundry/contexts.py 2014-05-26 20:43:13 +0000
+++ hooks/charmhelpers/contrib/cloudfoundry/contexts.py 2014-06-10 15:52:03 +0000
@@ -33,7 +33,7 @@
class NatsRelation(RelationContext):
interface = 'nats'
- required_keys = ['nats_port', 'nats_address', 'nats_user', 'nats_password']
+ required_keys = ['address', 'port', 'user', 'password']
class MysqlRelation(RelationContext):
@@ -44,9 +44,10 @@
def get_data(self):
RelationContext.get_data(self)
if self.is_ready():
- if 'port' not in self['db']:
- self['db']['port'] = '3306'
- self['db']['dsn'] = self.dsn_template.format(**self['db'])
+ for unit in self['db']:
+ if 'port' not in unit:
+ unit['port'] = '3306'
+ unit['dsn'] = self.dsn_template.format(**unit)
class RouterRelation(RelationContext):
@@ -56,9 +57,19 @@
class LogRouterRelation(RelationContext):
interface = 'logrouter'
- required_keys = ['shared-secret', 'logrouter-address']
+ required_keys = ['shared_secret', 'address', 'incoming_port', 'outgoing_port']
class LoggregatorRelation(RelationContext):
interface = 'loggregator'
- required_keys = ['shared_secret', 'loggregator_address']
+ required_keys = ['address', 'incoming_port', 'outgoing_port']
+
+
+class EtcdRelation(RelationContext):
+ interface = 'etcd'
+ required_keys = ['hostname', 'port']
+
+
+class CloudControllerRelation(RelationContext):
+ interface = 'cc'
+ required_keys = ['hostname', 'port', 'user', 'password']
=== modified file 'hooks/charmhelpers/core/services.py'
--- hooks/charmhelpers/core/services.py 2014-05-29 17:25:49 +0000
+++ hooks/charmhelpers/core/services.py 2014-06-10 15:52:03 +0000
@@ -11,6 +11,14 @@
"""
Register a list of services, given their definitions.
+ Traditional charm authoring is focused on implementing hooks. That is,
+ the charm author is thinking in terms of "What hook am I handling; what
+ does this hook need to do?" However, in most cases, the real question
+ should be "Do I have the information I need to configure and start this
+ piece of software and, if so, what are the steps for doing so." The
+ ServiceManager framework tries to bring the focus to the data and the
+ setup tasks, in the most declarative way possible.
+
Service definitions are dicts in the following formats (all keys except
'service' are optional):
@@ -67,28 +75,28 @@
a mongodb relation and which runs a custom `db_migrate` function prior to
restarting the service, and a Runit serivce called spadesd.
- >>> manager = services.ServiceManager([
- ... {
- ... 'service': 'bingod',
- ... 'ports': [80, 443],
- ... 'required_data': [MongoRelation(), config()],
- ... 'data_ready': [
- ... services.template(source='bingod.conf'),
- ... services.template(source='bingod.ini',
- ... target='/etc/bingod.ini',
- ... owner='bingo', perms=0400),
- ... ],
- ... },
- ... {
- ... 'service': 'spadesd',
- ... 'data_ready': services.template(source='spadesd_run.j2',
- ... target='/etc/sv/spadesd/run',
- ... perms=0555),
- ... 'start': runit_start,
- ... 'stop': runit_stop,
- ... },
- ... ])
- ... manager.manage()
+ manager = services.ServiceManager([
+ {
+ 'service': 'bingod',
+ 'ports': [80, 443],
+ 'required_data': [MongoRelation(), config(), {'my': 'data'}],
+ 'data_ready': [
+ services.template(source='bingod.conf'),
+ services.template(source='bingod.ini',
+ target='/etc/bingod.ini',
+ owner='bingo', perms=0400),
+ ],
+ },
+ {
+ 'service': 'spadesd',
+ 'data_ready': services.template(source='spadesd_run.j2',
+ target='/etc/sv/spadesd/run',
+ perms=0555),
+ 'start': runit_start,
+ 'stop': runit_stop,
+ },
+ ])
+ manager.manage()
"""
self.services = {}
for service in services or []:
@@ -213,55 +221,73 @@
interface = None
required_keys = []
+ def __init__(self, *args, **kwargs):
+ super(RelationContext, self).__init__(*args, **kwargs)
+ self.get_data()
+
def __bool__(self):
"""
- Updates the data and returns True if all of the required_keys are available.
+ Returns True if all of the required_keys are available.
"""
- self.get_data()
return self.is_ready()
__nonzero__ = __bool__
+ def __repr__(self):
+ return super(RelationContext, self).__repr__()
+
def is_ready(self):
"""
- Returns True if all of the required_keys are available.
- """
- return set(self.get(self.interface, {}).keys()).issuperset(set(self.required_keys))
+ Returns True if all of the `required_keys` are available from any units.
+ """
+ ready = len(self.get(self.interface, [])) > 0
+ if not ready:
+ hookenv.log('Incomplete relation: {}'.format(self.__class__.__name__), hookenv.DEBUG)
+ return ready
+
+ def _is_ready(self, unit_data):
+ """
+ Helper method that tests a set of relation data and returns True if
+ all of the `required_keys` are present.
+ """
+ return set(unit_data.keys()).issuperset(set(self.required_keys))
def get_data(self):
"""
- Retrieve the relation data and store it under `self[self.interface]`.
-
- If there are more than one units related on the desired interface,
- then each unit will have its data stored under `self[self.interface][unit_id]`
- and one of the units with complete information will chosen at random
- to fill the values at `self[self.interface]`.
-
-
- For example:
-
- {
- 'foo': 'bar',
- 'unit/0': {
- 'foo': 'bar',
- },
- 'unit/1': {
- 'foo': 'baz',
- },
- }
+ Retrieve the relation data for each unit involved in a realtion and,
+ if complete, store it in a list under `self[self.interface]`. This
+ is automatically called when the RelationContext is instantiated.
+
+ The units are sorted lexographically first by the service ID, then by
+ the unit ID. Thus, if an interface has two other services, 'db:1'
+ and 'db:2', with 'db:1' having two units, 'wordpress/0' and 'wordpress/1',
+ and 'db:2' having one unit, 'mediawiki/0', all of which have a complete
+ set of data, the relation data for the units will be stored in the
+ order: 'wordpress/0', 'wordpress/1', 'mediawiki/0'.
+
+ If you only care about a single unit on the relation, you can just
+ access it as `{{ interface[0]['key'] }}`. However, if you can at all
+ support multiple units on a relation, you should iterate over the list,
+ like:
+
+ {% for unit in interface -%}
+ {{ unit['key'] }}{% if not loop.last %},{% endif %}
+ {%- endfor %}
+
+ Note that since all sets of relation data from all related services and
+ units are in a single list, if you need to know which service or unit a
+ set of data came from, you'll need to extend this class to preserve
+ that information.
"""
if not hookenv.relation_ids(self.interface):
return
- ns = self.setdefault(self.interface, {})
- required = set(self.required_keys)
- for rid in hookenv.relation_ids(self.interface):
- for unit in hookenv.related_units(rid):
+ ns = self.setdefault(self.interface, [])
+ for rid in sorted(hookenv.relation_ids(self.interface)):
+ for unit in sorted(hookenv.related_units(rid)):
reldata = hookenv.relation_get(rid=rid, unit=unit)
- unit_ns = ns.setdefault(unit, {})
- unit_ns.update(reldata)
- if set(reldata.keys()).issuperset(required):
- ns.update(reldata)
+ if self._is_ready(reldata):
+ ns.append(reldata)
class ManagerCallback(object):
@@ -316,6 +342,6 @@
# Convenience aliases
-template = TemplateCallback
+render_template = template = TemplateCallback
open_ports = PortManagerCallback()
close_ports = PortManagerCallback()
=== modified file 'hooks/config.py'
--- hooks/config.py 2014-06-03 00:26:06 +0000
+++ hooks/config.py 2014-06-10 15:52:03 +0000
@@ -41,12 +41,22 @@
hookenv.log("Finished db:migrate", hookenv.DEBUG)
+API_CONTEXT = contexts.StoredContext('api_credentials.yml', {
+ 'api': {
+ 'hostname': hookenv.unit_get('private-address').encode('utf-8'),
+ 'port': 9022,
+ 'user': host.pwgen(7),
+ 'password': host.pwgen(7),
+ }})
+
+
SERVICES = [
{
'service': 'cf-cloudcontroller',
'required_data': [contexts.NatsRelation(),
contexts.RouterRelation(),
- contexts.MysqlRelation()],
+ contexts.MysqlRelation(),
+ API_CONTEXT],
'data_ready': [
services.template(source='cf-cloudcontroller.conf',
target='/etc/init/cf-cloudcontroller.conf'),
=== modified file 'metadata.yaml'
--- metadata.yaml 2014-05-15 16:40:34 +0000
+++ metadata.yaml 2014-06-10 15:52:03 +0000
@@ -10,8 +10,8 @@
- misc
subordinate: false
provides:
- provides-relation:
- interface: cf-cloud-controller
+ cc:
+ interface: controller
requires:
nats:
interface: nats
@@ -20,4 +20,3 @@
db:
interface: mysql
optional: true
-
=== modified file 'templates/cloud_controller.yml'
--- templates/cloud_controller.yml 2014-05-16 02:59:59 +0000
+++ templates/cloud_controller.yml 2014-06-10 15:52:03 +0000
@@ -1,18 +1,18 @@
-local_route: {{ router['domain'] }}
+local_route: {{ router[0]['domain'] }}
port: 9022
pid_filename: /var/vcap/sys/run/cloud_controller_ng/cloud_controller_ng.pid
development_mode: false
message_bus_servers:
- - nats://{{ nats['nats_user'] }}:{{ nats['nats_password'] }}@{{ nats['nats_address'] }}:{{ nats['nats_port'] }}
+ - nats://{{ nats[0]['user'] }}:{{ nats[0]['password'] }}@{{ nats[0]['address'] }}:{{ nats[0]['port'] }}
external_domain:
- - api.{{ router['domain'] }}
+ - api.{{ router[0]['domain'] }}
system_domain_organization: my-org
-system_domain: {{ router['domain'] }}
-app_domains: [ {{ router['domain'] }} ]
-srv_api_uri: http://api.{{ router['domain'] }}
+system_domain: {{ router[0]['domain'] }}
+app_domains: [ {{ router[0]['domain'] }} ]
+srv_api_uri: http://api.{{ router[0]['domain'] }}
default_app_memory: 1024
@@ -21,8 +21,8 @@
bootstrap_admin_email: admin@my-org
bulk_api:
- auth_user: bulk_api
- auth_password: "Password"
+ auth_user: {{api['user']}}
+ auth_password: "{{api['password']}}"
nginx:
use_nginx: false
@@ -54,17 +54,17 @@
db: &db
- database: {{db['dsn']}}
+ database: {{db[0]['dsn']}}
max_connections: 25
pool_timeout: 10
log_level: debug2
login:
- url: http://uaa.{{ router['domain'] }}
+ url: http://uaa.{{ router[0]['domain'] }}
uaa:
- url: http://uaa.{{ router['domain'] }}
+ url: http://uaa.{{ router[0]['domain'] }}
resource_id: cloud_controller
#symmetric_secret: cc-secret
verification_key: |
References
