← Back to branch summary

~thedac/charms/trusty/rabbitmq-server/backport-cluster-race-fixes

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/core/services/helpers.py

  • Committer: james.page at ubuntu
  • Date: 2015-03-26 13:07:43 UTC
  • mfrom: (82.2.3 rabbitmq-server)
  • Revision ID: james.page@ubuntu.com-20150326130743-opg59sdo60s2lx6j
Merge in trunk charm changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/core/services/helpers.py
45
45
    """
46
46
    name = None
47
47
    interface = None
48
 
    required_keys = []
49
48
 
50
49
    def __init__(self, name=None, additional_required_keys=None):
 
50
        if not hasattr(self, 'required_keys'):
 
51
            self.required_keys = []
 
52
 
51
53
        if name is not None:
52
54
            self.name = name
53
 
        if additional_required_keys is not None:
 
55
        if additional_required_keys:
54
56
            self.required_keys.extend(additional_required_keys)
55
57
        self.get_data()
56
58
 
134
136
    """
135
137
    name = 'db'
136
138
    interface = 'mysql'
137
 
    required_keys = ['host', 'user', 'password', 'database']
 
139
 
 
140
    def __init__(self, *args, **kwargs):
 
141
        self.required_keys = ['host', 'user', 'password', 'database']
 
142
        super(HttpRelation).__init__(self, *args, **kwargs)
138
143
 
139
144
 
140
145
class HttpRelation(RelationContext):
146
151
    """
147
152
    name = 'website'
148
153
    interface = 'http'
149
 
    required_keys = ['host', 'port']
 
154
 
 
155
    def __init__(self, *args, **kwargs):
 
156
        self.required_keys = ['host', 'port']
 
157
        super(HttpRelation).__init__(self, *args, **kwargs)
150
158
 
151
159
    def provide_data(self):
152
160
        return {