← Back to branch summary

~jimbaker/pyjuju/debug-relation-hook-context

« back to all changes in this revision

Viewing changes to juju/environment/config.py

https://launchpad.net/bugs/781949
[r=hazmat][f=781949] Make it so EC2 provider can check SSL cert validity

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/environment/config.py
19
19
    control-bucket: %(control-bucket)s
20
20
    admin-secret: %(admin-secret)s
21
21
    default-series: oneiric
 
22
    ssl-hostname-verification: true
22
23
"""
23
24
 
24
25
_EITHER_PLACEMENT = OneOf(Constant("unassigned"), Constant("local"))
41
42
                Constant("ap-southeast-1")),
42
43
            "ec2-uri": String(),
43
44
            "s3-uri": String(),
 
45
            "ssl-hostname-verification": OneOf(
 
46
                    Constant(True),
 
47
                    Constant(False)),
44
48
            "placement": _EITHER_PLACEMENT,
45
49
            "default-series": String()},
46
50
            optional=[
47
51
                "access-key", "secret-key", "region", "ec2-uri", "s3-uri",
48
 
                "placement"]),
 
52
                "placement", "ssl-hostname-verification"]),
49
53
        "orchestra": KeyDict({
50
54
            "orchestra-server": String(),
51
55
            "orchestra-user": String(),