Merge "Remove redundant settings from containers"
This commit is contained in:
commit
6d0ce122d6
@ -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.
|
# Define a single controller node and a single compute node.
|
||||||
overcloud_nodes:
|
overcloud_nodes:
|
||||||
- name: control_0
|
- name: control_0
|
||||||
@ -40,22 +37,13 @@ test_ping: true
|
|||||||
run_tempest: false
|
run_tempest: false
|
||||||
tempest_workers: 4
|
tempest_workers: 4
|
||||||
|
|
||||||
# Config for custom tripleo-heat-templates
|
# Config for custom tripleo-heat-templates, used in overcloud-prep-config
|
||||||
overcloud_templates_path: /home/stack/tripleo-heat-templates
|
# overcloud_templates_path: /home/stack/tripleo-heat-templates
|
||||||
overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates
|
# overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates
|
||||||
# use templates_branch when not testing with an unmerged review
|
# 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
|
# use templates_refspec when testing with an unmerged review
|
||||||
overcloud_templates_refspec:
|
# 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:
|
|
||||||
|
|
||||||
|
|
||||||
# options below direct automatic doc generation by tripleo-collect-logs
|
# options below direct automatic doc generation by tripleo-collect-logs
|
||||||
artcl_gen_docs: true
|
artcl_gen_docs: true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user