summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-04 13:20:11 +0000
committerGerrit Code Review <review@openstack.org>2017-08-04 13:20:11 +0000
commitfd1b1f8ec647d56346c0ad3728fed8fbfb482632 (patch)
tree0f12e1ec42b10e9bef9242c13f1b95510d57c023 /environments
parentbbe2244c69f570cf10ecea886c4ddd721e96b9fd (diff)
parent17804c7740f9a6ee0567c1983c8e2d46426207d4 (diff)
Merge "Copy scheduler configuration from service/ironic to services-docker/ironic"
Diffstat (limited to 'environments')
-rw-r--r--environments/services-docker/ironic.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/services-docker/ironic.yaml b/environments/services-docker/ironic.yaml
index e927ecb3..d98ca1d4 100644
--- a/environments/services-docker/ironic.yaml
+++ b/environments/services-docker/ironic.yaml
@@ -3,3 +3,5 @@ resource_registry:
OS::TripleO::Services::IronicConductor: ../../docker/services/ironic-conductor.yaml
OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
OS::TripleO::Services::NovaIronic: ../../docker/services/nova-ironic.yaml
+parameter_defaults:
+ NovaSchedulerDiscoverHostsInCellsInterval: 15