From 112f3799849ce0ae48e4264d065c14ebdb3934de Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Wed, 11 Nov 2020 20:42:14 +0000 Subject: [PATCH] Stop including nova::metadata on computes I5da1e67684f8317eec8c499c3534977e00a63098 include nova::metadata on computes however this includes nova::db which we must not do on computes. Push the fix up to puppet-nova and nova. Depends-On: https://review.opendev.org/774478 Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/774476 Related-bug: #1871482 Related-bug: #1903908 Related-bug: #1832537 Change-Id: I07caa3185427b48e6e7d60965fa3e6157457018c (cherry picked from commit 287b1b6ce77fe143d781ccd1b900c3bdbe6ada87) (cherry picked from commit 3e92158b57d1bd1bdac54b52660df8ae1da06742) (cherry picked from commit e199985ef10089fdfdb6c7e599810eda2150e9a0) --- manifests/profile/base/nova/compute.pp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp index cc5afa5b7..0bba7222b 100644 --- a/manifests/profile/base/nova/compute.pp +++ b/manifests/profile/base/nova/compute.pp @@ -78,11 +78,6 @@ class tripleo::profile::base::nova::compute ( # deploy bits to connect nova compute to neutron include ::nova::network::neutron - - # we need to set nova::metadata::dhcp_domain which sets - # [api]/dhcp_domain as this is used by the virt driver - # to generate the config drive - include ::nova::metadata } # If NFS is used as a Cinder or Nova backend