← Back to branch summary

~1chb1n/charms/trusty/keystone/next-revert166

« back to all changes in this revision

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

  • Committer: Billy Olsen
  • Date: 2015-06-22 17:03:00 UTC
  • mfrom: (154.1.1 keystone)
  • Revision ID: billy.olsen@canonical.com-20150622170300-2j8c4eytbm4unoi6
[corey.bryant,r=billy-olsen] Fix global requirements for git-deploy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/amulet/deployment.py
110
110
        (self.precise_essex, self.precise_folsom, self.precise_grizzly,
111
111
         self.precise_havana, self.precise_icehouse,
112
112
         self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
113
 
         self.trusty_kilo, self.vivid_kilo) = range(10)
 
113
         self.trusty_kilo, self.vivid_kilo, self.trusty_liberty,
 
114
         self.wily_liberty) = range(12)
114
115
 
115
116
        releases = {
116
117
            ('precise', None): self.precise_essex,
121
122
            ('trusty', None): self.trusty_icehouse,
122
123
            ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
123
124
            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
 
125
            ('trusty', 'cloud:trusty-liberty'): self.trusty_liberty,
124
126
            ('utopic', None): self.utopic_juno,
125
 
            ('vivid', None): self.vivid_kilo}
 
127
            ('vivid', None): self.vivid_kilo,
 
128
            ('wily', None): self.wily_liberty}
126
129
        return releases[(self.series, self.openstack)]
127
130
 
128
131
    def _get_openstack_release_string(self):
138
141
            ('trusty', 'icehouse'),
139
142
            ('utopic', 'juno'),
140
143
            ('vivid', 'kilo'),
 
144
            ('wily', 'liberty'),
141
145
        ])
142
146
        if self.openstack:
143
147
            os_origin = self.openstack.split(':')[1]