Add attribute for stack_scheduler_hints
Add attribute for newly option stack_scheduler_hints, related commit is https://review.openstack.org/#/c/96889/ . Change-Id: Ib02ff0ec8e1713f701737fa7ac95a91dd810eb01
This commit is contained in:
parent
075c0f5529
commit
0a75e91d11
|
@ -150,6 +150,9 @@ default['openstack']['orchestration']['stack_domain_admin'] = nil
|
||||||
# Select deferred auth method, stored password or trusts.
|
# Select deferred auth method, stored password or trusts.
|
||||||
default['openstack']['orchestration']['deferred_auth_method'] = 'trusts'
|
default['openstack']['orchestration']['deferred_auth_method'] = 'trusts'
|
||||||
|
|
||||||
|
# If true, will passing stack information to scheduler hints when creating instances.
|
||||||
|
default['openstack']['orchestration']['stack_scheduler_hints'] = false
|
||||||
|
|
||||||
# If set, heat API service will bind to the address on this interface,
|
# If set, heat API service will bind to the address on this interface,
|
||||||
# otherwise it will bind to the API endpoint's host.
|
# otherwise it will bind to the API endpoint's host.
|
||||||
default['openstack']['orchestration']['api']['bind_interface'] = nil
|
default['openstack']['orchestration']['api']['bind_interface'] = nil
|
||||||
|
|
|
@ -332,6 +332,7 @@ shared_examples 'expects to create heat conf' do
|
||||||
/^admin_password=heat-pass$/,
|
/^admin_password=heat-pass$/,
|
||||||
/^admin_tenant_name=service$/,
|
/^admin_tenant_name=service$/,
|
||||||
/^deferred_auth_method=trusts$/,
|
/^deferred_auth_method=trusts$/,
|
||||||
|
/^stack_scheduler_hints=false$/,
|
||||||
%r{^signing_dir=/var/cache/heat$},
|
%r{^signing_dir=/var/cache/heat$},
|
||||||
/^region_name_for_services=RegionOne$/
|
/^region_name_for_services=RegionOne$/
|
||||||
].each do |line|
|
].each do |line|
|
||||||
|
|
|
@ -78,6 +78,17 @@ deferred_auth_method=<%= node['openstack']['orchestration']['deferred_auth_metho
|
||||||
# notification module. (string value)
|
# notification module. (string value)
|
||||||
#onready=<None>
|
#onready=<None>
|
||||||
|
|
||||||
|
# When this feature is enabled, scheduler hints identifying the heat stack
|
||||||
|
# context of a server resource are passed to the configured schedulers in nova,
|
||||||
|
# for server creates done using heat resource types OS::Nova::Server and
|
||||||
|
# AWS::EC2::Instance. heat_root_stack_id will be set to the id of the root
|
||||||
|
# stack of the resource, heat_stack_id will be set to the id of the resource's
|
||||||
|
# parent stack, heat_stack_name will be set to the name of the resource's
|
||||||
|
# parent stack, heat_path_in_stack will be set to a list of tuples,
|
||||||
|
# (stackresourcename, stackname) with list[0] being (None, rootstackname), and
|
||||||
|
# heat_resource_name will be set to the resource's name. (boolean value)
|
||||||
|
stack_scheduler_hints=<%= node["openstack"]["orchestration"]["stack_scheduler_hints"] %>
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Options defined in heat.common.config
|
# Options defined in heat.common.config
|
||||||
|
|
Loading…
Reference in New Issue