Added missing dns and concat_base dependency
The module has a strong dependency on theforeman/dns, but this module isn't listed nor in fixtures and metadata. This commit also remove hardcoding of named user (named on RH and bind on Debian OS). Change-Id: I60c695aff85ba1cad4b0d4a5f14e9c42e95569d7
This commit is contained in:
parent
a44014c08f
commit
04dcdd4c45
|
@ -1,6 +1,8 @@
|
|||
fixtures:
|
||||
repositories:
|
||||
'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile'
|
||||
'concat_native': 'git://github.com/theforeman/puppet-concat.git'
|
||||
'dns': 'git://github.com/theforeman/puppet-dns.git'
|
||||
'inifile': 'git://github.com/puppetlabs/puppetlabs-inifile.git'
|
||||
'keystone': 'git://github.com/stackforge/puppet-keystone.git'
|
||||
'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git'
|
||||
'openstacklib': 'git://github.com/stackforge/puppet-openstacklib.git'
|
||||
|
|
|
@ -7,10 +7,10 @@ class designate::dns (
|
|||
|
||||
include dns::params
|
||||
file { $designatepath:
|
||||
ensure => directory,
|
||||
owner => 'named',
|
||||
group => $dns::params::group,
|
||||
mode => '0770',
|
||||
ensure => directory,
|
||||
owner => $::dns::params::user,
|
||||
group => $::dns::params::group,
|
||||
mode => '0770',
|
||||
}
|
||||
|
||||
exec { 'create-designatefile':
|
||||
|
@ -20,14 +20,14 @@ class designate::dns (
|
|||
}
|
||||
|
||||
file { $designatefile:
|
||||
owner => 'named',
|
||||
group => $dns::params::group,
|
||||
owner => $::dns::params::user,
|
||||
group => $::dns::params::group,
|
||||
mode => '0660',
|
||||
require => Exec['create-designatefile'],
|
||||
}
|
||||
|
||||
file_line {'dns designate path':
|
||||
path => $dns::params::namedconf_path,
|
||||
path => $::dns::params::namedconf_path,
|
||||
line => "include \"${designatefile}\";",
|
||||
match => '^include \"(.*)$',
|
||||
require => Class['designate'],
|
||||
|
|
|
@ -21,7 +21,7 @@ class designate(
|
|||
user { 'designate':
|
||||
name => 'designate',
|
||||
gid => 'designate',
|
||||
groups => ['designate','named'],
|
||||
groups => ['designate',$::dns::params::group],
|
||||
system => true,
|
||||
require => [Package['openstack-designate'],Class['::dns']],
|
||||
}
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
"dependencies": [
|
||||
{ "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
|
||||
{ "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
|
||||
{ "name": "theforeman/dns", "version_requirement": ">=1.4.0 <2.0.0" },
|
||||
{ "name": "stackforge/openstacklib", "version_requirement": ">=5.0.0" }
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue