← Back to branch summary

~openstack-charmers-next/charms/wily/heat/trunk

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: Edward Hope-Morley
  • Date: 2016-02-18 13:47:28 UTC
  • mfrom: (68.1.9 trunk)
  • Revision ID: edward.hope-morley@canonical.com-20160218134728-8u8l51lv7y72iy2c
[hopem,r=jamespage]
 
Sync charmhelpers to get support for supplying a Ascii Armor PGP key to
openstack-origin (currently only supports Radix64)
Closes-Bug: 1518975

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
128
128
        # Authenticate admin with heat endpoint
129
129
        self.heat = u.authenticate_heat_admin(self.keystone)
130
130
 
 
131
        if self._get_openstack_release() >= self.trusty_kilo:
 
132
            u.wait_on_action(u.run_action(self.heat_sentry, 'domain-setup'))
 
133
 
131
134
    def _image_create(self):
132
135
        """Create an image to be used by the heat template, verify it exists"""
133
136
        u.log.debug('Creating glance image ({})...'.format(IMAGE_NAME))
482
485
                'instance_driver': 'heat.engine.nova',
483
486
                'plugin_dirs': '/usr/lib64/heat,/usr/lib/heat',
484
487
                'environment_dir': '/etc/heat/environment.d',
485
 
                'deferred_auth_method': 'password',
486
488
                'host': 'heat',
487
 
                'rabbit_userid': 'heat',
488
 
                'rabbit_virtual_host': 'openstack',
489
 
                'rabbit_password': rmq_rel['password'],
490
 
                'rabbit_host': rmq_rel['hostname']
491
489
            },
492
490
            'keystone_authtoken': {
493
491
                'auth_uri': auth_uri,
513
511
            },
514
512
        }
515
513
 
 
514
        rabbit_entries = {'rabbit_userid': 'heat',
 
515
                          'rabbit_virtual_host': 'openstack',
 
516
                          'rabbit_password': rmq_rel['password'],
 
517
                          'rabbit_host': rmq_rel['hostname']}
 
518
        if self._get_openstack_release() <= self.utopic_juno:
 
519
            expected['DEFAULT']['deferred_auth_method'] = 'password'
 
520
            expected['DEFAULT'].update(rabbit_entries)
 
521
        else:
 
522
            expected['DEFAULT']['deferred_auth_method'] = 'trusts'
 
523
            expected['oslo_messaging_rabbit'] = rabbit_entries
 
524
            del expected['keystone_authtoken']['auth_host']
 
525
            del expected['keystone_authtoken']['auth_port']
 
526
            del expected['keystone_authtoken']['auth_protocol']
 
527
 
516
528
        for section, pairs in expected.iteritems():
517
529
            ret = u.validate_config_data(unit, conf, section, pairs)
518
530
            if ret: