From 4217767d8782abae02b11f553fc14daf7cd72916 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Fri, 20 Oct 2017 23:27:15 +0100 Subject: Refactor cellv2 host discovery logic to avoid races The compute service list is polled until all expected hosts are reported or a timeout occurs (600s). Adds a cellv2_discovery flag to puppet services. Used to generate a list of hosts that should have cellv2 host mappings. Adds a canonical fqdn and that should match the fqdn reported by a host. Adds the ability to upload a config script for docker config instead of using complex bash on-liners. Closes-bug: 1720821 Change-Id: I33e2f296526c957cb5f96dff19682a4e60c6a0f0 (cherry picked from commit 61fcfca045aeb5be1ee280d8dd9c260fb39b9084) --- docker/services/nova-compute.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/services/nova-compute.yaml') diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index b43193ec..6db9e580 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -73,6 +73,7 @@ outputs: description: Role data for the Nova Compute service. value: service_name: {get_attr: [NovaComputeBase, role_data, service_name]} + cellv2_discovery: true config_settings: get_attr: [NovaComputeBase, role_data, config_settings] logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]} @@ -111,7 +112,6 @@ outputs: owner: nova:nova recurse: true docker_config: - # FIXME: run discover hosts here step_4: nova_compute: image: &nova_compute_image {get_param: DockerNovaComputeImage} -- cgit 1.2.3-korg