From 5eb15d2e4a9b41a88984ad7769c5c473e56dc89c Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 6 Nov 2015 01:11:50 -0500 Subject: [PATCH] Make RHEL build properly build.py -b rhel -t [rdo|rhos|source|binary] The last patch for this didn't quite fix the problem properly as it only permitted RHOS builds. backport: liberty Change-Id: I27eed202560adce450c07d043cc224e7a6c6bbf6 Closes-Bug: #1513088 --- kolla/cmd/build.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index e51612c41e..0ed2c6a077 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -315,19 +315,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']