Merge "Consolidate kolla-build configuration in one file"

build.ini

@@ -1,63 +0,0 @@
-[ceilometer-base]
-type = url
-location = http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz
-
-[cinder-base]
-type = url
-location = http://tarballs.openstack.org/cinder/cinder-master.tar.gz
-
-[designate-base]
-type = url
-location = http://tarballs.openstack.org/designate/designate-master.tar.gz
-
-[glance-base]
-type = url
-location = http://tarballs.openstack.org/glance/glance-master.tar.gz
-
-[gnocchi-base]
-type = url
-location = http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz
-
-[heat-base]
-type = url
-location = http://tarballs.openstack.org/heat/heat-master.tar.gz
-
-[horizon]
-type = url
-location = http://tarballs.openstack.org/horizon/horizon-master.tar.gz
-
-[ironic-base]
-type = url
-location = http://tarballs.openstack.org/ironic/ironic-master.tar.gz
-
-[keystone]
-type = url
-location = http://tarballs.openstack.org/keystone/keystone-master.tar.gz
-
-[magnum-base]
-type = url
-location = http://tarballs.openstack.org/magnum/magnum-master.tar.gz
-
-[murano-base]
-type = url
-location = http://tarballs.openstack.org/murano/murano-master.tar.gz
-
-[neutron-base]
-type = url
-location = http://tarballs.openstack.org/neutron/neutron-master.tar.gz
-
-[nova-base]
-type = url
-location = http://tarballs.openstack.org/nova/nova-master.tar.gz
-
-[nova-novncproxy]
-type = url
-location = http://github.com/kanaka/noVNC/tarball/v0.5.1
-
-[swift-base]
-type = url
-location = http://tarballs.openstack.org/swift/swift-master.tar.gz
-
-[zaqar]
-type = url
-location = http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz

doc/image-building.rst

@@ -75,8 +75,10 @@ You can change it to ``source`` using the following command:
 
     tools/build.py -t source
 
-The locations of OpenStack source code are written in ``build.ini``.
+The locations of OpenStack source code are written in
-Now the source type support ``url`` and ``git``. The ``build.ini`` looks like:
+``etc/kolla/kolla-build.conf``.
+Now the source type support ``url`` and ``git``. The
+``etc/kolla/kolla-build.conf`` looks like:
 
 ::
 

etc/kolla/kolla-build.conf

@@ -41,3 +41,81 @@
 
 # Path to custome file to be addded at end of Dockerfiles for final images
 #include_footer = /path/to/footer_file
+
+
+# Provide location of sources for source install builds.
+# Example:
+#
+# [image-name]
+# type = url
+# location: http://address/of/archive.tgz
+#
+# [another-image-name]
+# type = git
+# location: git://address/of/repository.git
+# reference: stable  # git reference to pull, commit sha, tag or branch name
+#                    # pulls from master branch unless specified otherwise
+
+[ceilometer-base]
+type = url
+location = http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz
+
+[cinder-base]
+type = url
+location = http://tarballs.openstack.org/cinder/cinder-master.tar.gz
+
+[designate-base]
+type = url
+location = http://tarballs.openstack.org/designate/designate-master.tar.gz
+
+[glance-base]
+type = url
+location = http://tarballs.openstack.org/glance/glance-master.tar.gz
+
+[gnocchi-base]
+type = url
+location = http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz
+
+[heat-base]
+type = url
+location = http://tarballs.openstack.org/heat/heat-master.tar.gz
+
+[horizon]
+type = url
+location = http://tarballs.openstack.org/horizon/horizon-master.tar.gz
+
+[ironic-base]
+type = url
+location = http://tarballs.openstack.org/ironic/ironic-master.tar.gz
+
+[keystone]
+type = url
+location = http://tarballs.openstack.org/keystone/keystone-master.tar.gz
+
+[magnum-base]
+type = url
+location = http://tarballs.openstack.org/magnum/magnum-master.tar.gz
+
+[murano-base]
+type = url
+location = http://tarballs.openstack.org/murano/murano-master.tar.gz
+
+[neutron-base]
+type = url
+location = http://tarballs.openstack.org/neutron/neutron-master.tar.gz
+
+[nova-base]
+type = url
+location = http://tarballs.openstack.org/nova/nova-master.tar.gz
+
+[nova-novncproxy]
+type = url
+location = http://github.com/kanaka/noVNC/tarball/v0.5.1
+
+[swift-base]
+type = url
+location = http://tarballs.openstack.org/swift/swift-master.tar.gz
+
+[zaqar]
+type = url
+location = http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz

kolla/cmd/build.py

@@ -296,11 +296,11 @@ class KollaWorker(object):
         self.type_ = config['type']
         self.tag = config['tag']
         self.prefix = self.base + '-' + self.type_ + '-'
-        self.source_location = ConfigParser.SafeConfigParser()
-        self.source_location.read(os.path.join(self.base_dir, 'build.ini'))
         self.include_header = config['include_header']
         self.include_footer = config['include_footer']
         self.regex = config['regex']
+        self.source_location = ConfigParser.SafeConfigParser()
+        self.source_location.read(find_config_file('kolla-build.conf'))
 
         self.image_statuses_bad = dict()
         self.image_statuses_good = dict()

setup.cfg

@@ -29,7 +29,6 @@ data_files =
     share/kolla/vagrant = vagrant/*
     share/kolla = tools/init-runonce
     share/kolla = tools/openrc-example
-    share/kolla = build.ini
 
 scripts =
     tools/kolla-ansible