From 3b3d6df0c2ab33bffdb85006468519f62f1417ef Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 24 Dec 2015 01:07:29 +0800 Subject: use oslo.config instead of raw argparse.ArgumentParser * Use oslo.config library * kolla-build section is deprecated in favor of DEFAULT section * Remove the deprecated `--template` option * `--no-cache` is deprecated in favor of `--cache` and `--nocache` options, which are using oslo BoolOpt inverse feature[0] [0] https://github.com/openstack/oslo.config/blob/master/oslo_config/cfg.py#L1074 Closes-Bug: #1528542 Change-Id: I62c5ca3c8e057917d2798256e9d9efc8f6578f60 --- etc/kolla/kolla-build.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'etc') diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf index 39d210925..e75788ddc 100644 --- a/etc/kolla/kolla-build.conf +++ b/etc/kolla/kolla-build.conf @@ -1,6 +1,6 @@ # Configuration for kolla build script -[kolla-build] +[DEFAULT] #The MAINTAINER field #maintainer = Kolla Project (https://launchpad.net/kolla) @@ -58,11 +58,11 @@ # 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 +#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: -- cgit v1.2.3