From c95254293b8068057c42ddae8b45eadec87c5f70 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 8 Mar 2018 11:00:41 -0700 Subject: [PATCH] Remove cloud-init and disable os-collect-config A user uses a guest image for the undercloud, cloud-init may be installed which can also cause other services like os-collect-config to be running. We should ensure that cloud-init is removed and that the os-collect-config service is disable to prevent it from interfering with overcloud deployments. Change-Id: I58f6fc4b299c8f1f561205ac9a2de75c46467ba8 Closes-Bug: #1754426 (cherry picked from commit 998230da5cb6c0b725b8e67c82bf2157b9f0c46b) --- elements/puppet-stack-config/puppet-stack-config.pp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp index 977e48251..10f9f6e3b 100644 --- a/elements/puppet-stack-config/puppet-stack-config.pp +++ b/elements/puppet-stack-config/puppet-stack-config.pp @@ -30,6 +30,15 @@ file { '/etc/sysctl.d/ip-forward.conf': # is not enabled first. Sysctl::Value['net.ipv4.ip_forward'] -> Package<| title == 'docker' |> +# NOTE(aschultz): LP#1754426 - remove cloud-init and disable os-collect-config +package { 'cloud-init': + ensure => 'absent', +} +service { 'os-collect-config': + ensure => stopped, + enable => false, +} + # Run OpenStack db-sync at every puppet run, in any case. Exec<| title == 'neutron-db-sync' |> { refreshonly => false } Exec<| title == 'keystone-manage db_sync' |> { refreshonly => false }