← Back to branch summary

~larry-e-works/uci-engine/amqp-to-kombu

« back to all changes in this revision

Viewing changes to ci-utils/ci_utils/data_store.py

  • Committer: Larry Works
  • Date: 2014-09-30 18:08:31 UTC
  • mfrom: (762.1.55 uci-engine)
  • Revision ID: larry.works@canonical.com-20140930180831-cpztlnifhc47ah69
Massive merge from trunk, no conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ci-utils/ci_utils/data_store.py
68
68
            key=config.get('auth_password'),
69
69
            os_options={'tenant_name': config.get('auth_tenant_name'),
70
70
                        'region_name': config.get('auth_region')},
71
 
            auth_version='2.0')
 
71
            auth_version=('/v1.' in config.get('auth_url') and '1.0' or '2.0'))
72
72
        try:
73
73
            self._create_container(self.container_id)
74
74
        except client.ClientException: