From 4138b18c98232eb929fd491b3a4f4b0de5179d8d Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Thu, 5 Jan 2017 13:39:01 +0200 Subject: [PATCH] Remove redundant settings from containers Some settings in containers file are specific for developers usage and don't fit CI environment. Some of them are commented or removed. Change-Id: I0248059e9493e61dcafa39dce09fd84c43b41348 --- config/general_config/containers_minimal.yml | 22 +++++--------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/config/general_config/containers_minimal.yml b/config/general_config/containers_minimal.yml index c8e41c922..62be149f8 100644 --- a/config/general_config/containers_minimal.yml +++ b/config/general_config/containers_minimal.yml @@ -1,6 +1,3 @@ -# set the working_dir on the undercloud -working_dir: /home/stack - # Define a single controller node and a single compute node. overcloud_nodes: - name: control_0 @@ -36,22 +33,13 @@ test_ping: true run_tempest: false tempest_workers: 4 -# Config for custom tripleo-heat-templates -overcloud_templates_path: /home/stack/tripleo-heat-templates -overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates +# Config for custom tripleo-heat-templates, used in overcloud-prep-config +# overcloud_templates_path: /home/stack/tripleo-heat-templates +# overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates # use templates_branch when not testing with an unmerged review -overcloud_templates_branch: master +# overcloud_templates_branch: master # use templates_refspec when testing with an unmerged review -overcloud_templates_refspec: - -# Config for custom tripleo-common -overcloud_tripleo_common_path: /home/stack/tripleo-common -overcloud_tripleo_common_repo: https://git.openstack.org/openstack/tripleo-common -# use overcloud_tripleo_common _branch when not testing with an unmerged review -overcloud_tripleo_common_branch: master -# use overcloud_tripleo_common_refspec when testing with an unmerged review -overcloud_tripleo_common_refspec: - +# overcloud_templates_refspec: # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true