From 781eefeccf7f15475f62a68e1a837fce5415c530 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 7 Jan 2016 20:29:24 +0800 Subject: [PATCH] Remove the kolla-build.conf use tox -e genconfig to generate this file DocImpact Closes-Bug: #1531202 Change-Id: I3a6e57c3cc48aeb3a45a055b173207ea6e214960 --- .gitignore | 1 + dev/vagrant/bootstrap.sh | 3 + etc/kolla/kolla-build.conf | 181 ------------------------------------- tests/setup_gate.sh | 2 + 4 files changed, 6 insertions(+), 181 deletions(-) delete mode 100644 etc/kolla/kolla-build.conf diff --git a/.gitignore b/.gitignore index ee78f4f390..ed49576956 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ __pycache__/ AUTHORS ChangeLog doc/build +etc/kolla/kolla-build.conf # Files generated by Vagrant dev/vagrant/Vagrantfile.custom diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh index b33d294f05..1d34637068 100644 --- a/dev/vagrant/bootstrap.sh +++ b/dev/vagrant/bootstrap.sh @@ -96,6 +96,9 @@ function configure_operator { setenforce permissive cp -r ~vagrant/kolla/etc/kolla/ /etc/kolla + oslo-config-generator --config-file \ + ~vagrant/kolla/etc/oslo-config-generator/kolla-build.conf \ + --output-file /etc/kolla/kolla-build.conf mkdir -p /usr/share/kolla chown -R vagrant: /etc/kolla /usr/share/kolla diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf deleted file mode 100644 index e75788ddc4..0000000000 --- a/etc/kolla/kolla-build.conf +++ /dev/null @@ -1,181 +0,0 @@ -# Configuration for kolla build script - -[DEFAULT] - -#The MAINTAINER field -#maintainer = Kolla Project (https://launchpad.net/kolla) - -# The Docker namespace name -#namespace = kollaglue - -# The Docker tag -#tag = latest - -# The base distro to use when building -#base = centos - -# The base distro image tag -#base_tag = latest - -# The method of the OpenStack install -#install_type = binary - -# Do not use Docker cache when building -#no_cache = False - -# Keep failed intermediate containers -#keep = False - -# Push images after building -#push = False - -# The number of threads to user while pushing Images. -# Note: Docker can not handle threading push properly. -#push_threads = 1 - -# The number of threads to use while building -# Note: setting to one will allow real time logging -#threads = 8 - -# The number of times to retry while building -#retries = 3 - -# Turn on debugging log level -#debug = False - -# Path to custom file to be addded at beginning of base Dockerfile -#include_header = /path/to/header_file - -# Path to custom file to be addded at end of Dockerfiles for final images -#include_footer = /path/to/footer_file - -# The registry host. The default registry host is Docker Hub. -#registry = None - -# Comma separated list of .rpm or .repo file(s) or URL(s) to install before -# building containers. -#rpm_setup_config = http://trunk.rdoproject.org/centos7/currrent/delorean.repo,http://trunk.rdoproject.org/centos7/delorean-deps.repo - -# Preset build profiles can be set here to easily build common sets of images -[profiles] -#infra = ceph,data,mariadb,haproxy,keepalived,kolla-ansible,memcached,mongodb,openvswitch,rabbitmq,rsyslog -#main = cinder,ceilometer,glance,heat,horizon,keystone,neutron,nova,swift -#aux = aodh,designate,gnocchi,ironic,magnum,mistral,trove,zaqar -#default = data,kolla-ansible,glance,haproxy,heat,horizon,keepalived,keystone,memcached,mariadb,neutron,nova,openvswitch,rabbitmq,rsyslog -#gate = ceph,cinder,data,dind,glance,haproxy,heat,horizon,keepalived,keystone,kolla-ansible,mariadb,memcached,neutron,nova,openvswitch,rabbitmq,rsyslog - -# 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 - -[openstack-base] -type = url -location = https://github.com/openstack/requirements/tarball/master - -[aodh-base] -type = url -location = http://tarballs.openstack.org/aodh/aodh-master.tar.gz - -[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 - -[mistral-base] -type = url -location = http://tarballs.openstack.org/mistral/mistral-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 - -# The following two blocks show how plugins can be installed into supported -# images. Note, configuration will need to be provided via Ansible. -# -#[neutron-server-plugin-networking-arista] -#type = url -#location = http://tarballs.openstack.org/networking-arista/networking-arista-master.tar.gz - -#[neutron-server-plugin-networking-brocade] -#type = url -#location = http://tarballs.openstack.org/networking-brocade/networking-brocade-master.tar.gz - -[nova-base] -type = url -location = http://tarballs.openstack.org/nova/nova-master.tar.gz - -[nova-spicehtml5proxy] -## freedesktop.org has the latest untagged code and should be prefered for git -# type = git -# location = http://anongit.freedesktop.org/git/spice/spice-html5.git -# reference = master -type = url -location = http://github.com/SPICE/spice-html5/tarball/spice-html5-0.1.6 - -[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 - -[tempest] -type = url -location = http://tarballs.openstack.org/tempest/tempest-master.tar.gz - -[trove-base] -type = url -location = http://tarballs.openstack.org/trove/trove-master.tar.gz - -[zaqar] -type = url -location = http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz diff --git a/tests/setup_gate.sh b/tests/setup_gate.sh index 82657f37db..4f925cb0cb 100755 --- a/tests/setup_gate.sh +++ b/tests/setup_gate.sh @@ -19,6 +19,8 @@ function detect_disk { } function setup_config { + # generate the config + tox -e genconfig # Copy configs sudo cp -a etc/kolla /etc/ }