diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-06 15:55:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-06 15:55:43 +0000 |
| commit | c2191b101ff8518b0b87813c9fa2d4bfe73cb620 (patch) | |
| tree | eae3b66a6896ea53f4ae4c0434a460f13cda402f /kolla/cmd | |
| parent | b178ed2021e50a155d1323a964d89870d7c4dbba (diff) | |
| parent | 5eb15d2e4a9b41a88984ad7769c5c473e56dc89c (diff) | |
| download | kolla-c2191b101ff8518b0b87813c9fa2d4bfe73cb620.tar.gz kolla-c2191b101ff8518b0b87813c9fa2d4bfe73cb620.zip | |
Merge "Make RHEL build properly"
Diffstat (limited to 'kolla/cmd')
| -rwxr-xr-x | kolla/cmd/build.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 1a110f64a..e299c66e1 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -328,19 +328,20 @@ class KollaWorker(object): self.base_tag = config['base_tag'] self.install_type = config['install_type'] self.tag = config['tag'] - self.image_prefix = self.base + '-' + config['install_type'] + '-' self.images = list() - if '-' in config['install_type']: - self.install_type, self.install_metatype = \ - self.install_type.split('-', 2) - else: - if self.install_type == 'binary': - self.install_metatype = 'rdo' - elif self.install_type == 'source': - self.install_metatype = 'mixed' - elif self.install_type == 'rhel': - self.install_metatype = 'rhos' + if self.install_type == 'binary': + self.install_metatype = 'rdo' + elif self.install_type == 'source': + self.install_metatype = 'mixed' + elif self.install_type == 'rdo': + self.install_type = 'binary' + self.install_metatype = 'rdo' + elif self.install_type == 'rhos': + self.install_type = 'binary' + self.install_metatype = 'rhos' + + self.image_prefix = self.base + '-' + self.install_type + '-' self.tag = config['tag'] self.include_header = config['include_header'] |