opendev/system-config
Code Issues Proposed changes

Merge "Switch to using new ansible openstack inventory script"

Browse Source
This commit is contained in:
Zuul 2018-06-18 16:58:32 +00:00 committed by Gerrit Code Review
commit 2ee3403c69
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -262,10 +262,7 @@ class openstack_project::puppetmaster (
vcsrepo { '/opt/ansible': vcsrepo { '/opt/ansible':
ensure => latest, ensure => latest,
provider => git, provider => git,
# Pinned here because the shade + openstacksdk merger resulted in the revision => 'devel',
# openstack.py inventory script below getting renamed and may require new
# deps.
revision => 'v2.5.3',
source => 'https://github.com/ansible/ansible', source => 'https://github.com/ansible/ansible',
} }
@ -281,14 +278,25 @@ class openstack_project::puppetmaster (
} }
file { '/etc/ansible/hosts/openstack': file { '/etc/ansible/hosts/openstack':
ensure => absent,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
source => '/opt/ansible/contrib/inventory/openstack.py',
replace => true,
require => Vcsrepo['/opt/ansible'], require => Vcsrepo['/opt/ansible'],
} }
file { '/etc/ansible/hosts/openstack_inventory':
owner => 'root',
group => 'root',
mode => '0755',
source => '/opt/ansible/contrib/inventory/openstack_inventory.py',
replace => true,
require => [
File['/etc/ansible/hosts/openstack'],
Vcsrepo['/opt/ansible'],
],
}
file { '/etc/ansible/hosts/static': file { '/etc/ansible/hosts/static':
ensure => absent, ensure => absent,
} }