← Back to branch summary

~hopem/charms/trusty/cinder/fix-config-restart-svc-race

« back to all changes in this revision

Viewing changes to tests/charmhelpers/contrib/openstack/amulet/deployment.py

[1chb1n, r=gnuoy] auto normalize amulet test definitions and amulet make targets; charm-helper sync.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/openstack/amulet/deployment.py
101
101
           """
102
102
        (self.precise_essex, self.precise_folsom, self.precise_grizzly,
103
103
         self.precise_havana, self.precise_icehouse,
104
 
         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
 
104
         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
 
105
         self.utopic_juno, self.vivid_kilo) = range(10)
105
106
        releases = {
106
107
            ('precise', None): self.precise_essex,
107
108
            ('precise', 'cloud:precise-folsom'): self.precise_folsom,
110
111
            ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
111
112
            ('trusty', None): self.trusty_icehouse,
112
113
            ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
113
 
            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo}
 
114
            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
 
115
            ('utopic', None): self.utopic_juno,
 
116
            ('vivid', None): self.vivid_kilo}
114
117
        return releases[(self.series, self.openstack)]
115
118
 
116
119
    def _get_openstack_release_string(self):