openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make RHEL build properly"

Browse Source
This commit is contained in:
Jenkins 2015-11-06 15:55:43 +00:00 committed by Gerrit Code Review
commit c2191b101f
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kolla/cmd/build.py
View File

@ -328,19 +328,20 @@ class KollaWorker(object):
self.base_tag = config['base_tag'] self.base_tag = config['base_tag']
self.install_type = config['install_type'] self.install_type = config['install_type']
self.tag = config['tag'] self.tag = config['tag']
self.image_prefix = self.base + '-' + config['install_type'] + '-'
self.images = list() self.images = list()
if '-' in config['install_type']: if self.install_type == 'binary':
self.install_type, self.install_metatype = \ self.install_metatype = 'rdo'
self.install_type.split('-', 2) elif self.install_type == 'source':
else: self.install_metatype = 'mixed'
if self.install_type == 'binary': elif self.install_type == 'rdo':
self.install_metatype = 'rdo' self.install_type = 'binary'
elif self.install_type == 'source': self.install_metatype = 'rdo'
self.install_metatype = 'mixed' elif self.install_type == 'rhos':
elif self.install_type == 'rhel': self.install_type = 'binary'
self.install_metatype = 'rhos' self.install_metatype = 'rhos'
self.image_prefix = self.base + '-' + self.install_type + '-'
self.tag = config['tag'] self.tag = config['tag']
self.include_header = config['include_header'] self.include_header = config['include_header']