← Back to branch summary

~dpb/pyjuju/dont-proxy-https

« back to all changes in this revision

Viewing changes to juju/environment/config.py

Subordinate support in unit agent lifecycle [r=kapil] [f=805585,963355]

This branch lands the support in the unit agent which allows it to deploy 
subordinate services in its own container.

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/environment/config.py
9
9
    Constant, Dict, KeyDict, OAuthString, OneOf, SchemaError, SelectDict,
10
10
    String)
11
11
 
12
 
 
13
12
DEFAULT_CONFIG_PATH = "~/.juju/environments.yaml"
14
13
 
15
14
SAMPLE_CONFIG = """\
18
17
    type: ec2
19
18
    control-bucket: %(control-bucket)s
20
19
    admin-secret: %(admin-secret)s
21
 
    default-series: oneiric
 
20
    default-series: precise
22
21
    ssl-hostname-verification: true
23
22
"""
24
23
 
209
208
 
210
209
        defaults = {
211
210
            "control-bucket": "juju-%s" % (uuid.uuid4().hex),
212
 
            "admin-secret": "%s" % (uuid.uuid4().hex)}
 
211
            "admin-secret": "%s" % (uuid.uuid4().hex),
 
212
            "default-series": "precise"
 
213
        }
213
214
 
214
215
        with open(path, "w") as file:
215
216
            file.write(SAMPLE_CONFIG % defaults)