← Back to branch summary

~bjornt/charms/trusty/swift-storage/forward-port-bug-1350049-fix

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: james.page at ubuntu
  • Date: 2014-10-10 14:35:25 UTC
  • mfrom: (47.1.1 swift-storage)
  • Revision ID: james.page@ubuntu.com-20141010143525-wcjzi80lg20x095n
[coreycb] fixup amulet tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
61
61
                           'admin-token': 'ubuntutesting'}
62
62
        swift_proxy_config = {'zone-assignment': 'manual',
63
63
                           'replicas': '1',
64
 
                           'swift-hash': 'fdfef9d4-8b06-11e2-8ac0-531c923c8fae',
65
 
                           'use-https': 'no'}
 
64
                           'swift-hash': 'fdfef9d4-8b06-11e2-8ac0-531c923c8fae'}
66
65
        swift_storage_config = {'zone': '1',
67
66
                                'block-device': 'vdb',
68
67
                                'overwrite': 'true'}
392
391
            'app:object-server': {
393
392
                'use': 'egg:swift#object',
394
393
                'threads_per_disk': '4'
395
 
            }
 
394
            },
396
395
            'object-replicator': {
397
396
                'concurrency': '1'
398
397
            }