~james-page/charms/trusty/nova-cloud-controller/kilo

« back to all changes in this revision

Viewing changes to hooks/nova_cc_utils.py

  • Committer: james.page at ubuntu
  • Date: 2015-03-24 17:49:11 UTC
  • Revision ID: james.page@ubuntu.com-20150324174911-0mxr1mwppe778hee
Drop ec2 and s3 endpoints for kilo

Show diffs side-by-side

added added

removed removed

Lines of Context:
849
849
    if os_rel >= 'kilo':
850
850
        # NOTE(jamespage) drop endpoints for ec2 and s3
851
851
        #  ec2 is deprecated
852
 
        #  s3 is generate insecure and should die in flames
 
852
        #  s3 is insecure and should die in flames
853
853
        endpoints = {
854
854
            'ec2_service': None,
855
855
            'ec2_region': None,