openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Remove cloud-init and disable os-collect-config" into stable/queens

This commit is contained in:
Zuul 2018-03-16 01:02:06 +00:00 committed by Gerrit Code Review
parent a31ff5a850 6051d118cb
commit 4ddff7ef9b
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -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 }