Signed-off-by: Joey Boggs <[email protected]>
---
installer/modules/ovirt/manifests/freeipa.pp | 8 ++++----
installer/modules/ovirt/manifests/postgres.pp | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/installer/modules/ovirt/manifests/freeipa.pp
b/installer/modules/ovirt/manifests/freeipa.pp
index e5de852..f91cd43 100644
--- a/installer/modules/ovirt/manifests/freeipa.pp
+++ b/installer/modules/ovirt/manifests/freeipa.pp
@@ -29,12 +29,12 @@ class freeipa::bundled{
command => "/bin/hostname $ipa_host",
}
- exec {"set_kdc_defaults":
+ single_exec {"set_kdc_defaults":
command => "/bin/sed -i '/\[kdcdefaults\]/a \ kdc_ports = 88'
/usr/share/ipa/kdc.conf.template",
require => Package[ipa-server]
}
- exec {"replace_line_returns":
+ single_exec {"replace_line_returns":
command => "/bin/sed -i -e 's/^/#/'
/etc/httpd/conf.d/ipa-rewrite.conf",
require => Single_Exec[ipa_server_install]
}
@@ -43,7 +43,7 @@ class freeipa::bundled{
file => "/etc/httpd/conf.d/ipa.conf",
pattern => "^<Proxy \*>",
replacement => "<ProxyMatch ^.*/ipa/ui.*$>",
- require => Exec[replace_line_returns]
+ require => Single_exec[replace_line_returns]
}
file_replacement{"ipa_proxy_config_2":
@@ -61,7 +61,7 @@ class freeipa::bundled{
single_exec {"ipa_server_install":
command => "/usr/sbin/ipa-server-install -r $realm_name -p
'$freeipa_password' -P '$freeipa_password' -a '$freeipa_password' --hostname $ipa_host -u
dirsrv -U",
- require =>
[Exec[set_kdc_defaults],Single_exec[dnsmasq_restart]]
+ require =>
[Single_exec[set_kdc_defaults],Single_exec[dnsmasq_restart]]
}
exec {"get_krb5_tkt":
diff --git a/installer/modules/ovirt/manifests/postgres.pp
b/installer/modules/ovirt/manifests/postgres.pp
index 12b7764..42433ea 100644
--- a/installer/modules/ovirt/manifests/postgres.pp
+++ b/installer/modules/ovirt/manifests/postgres.pp
@@ -41,18 +41,18 @@ class postgres::bundled{
service {"postgresql" :
ensure => running,
enable => true,
- require =>
[Single_exec[initialize_db],Exec[postgres_add_localhost_trust],Exec[postgres_add_all_trust],Exec[postgres_add_ipv6_loopback_trust]],
+ require =>
[Single_exec[initialize_db],Exec[postgres_add_localhost_trust],Single_exec[postgres_add_all_trust],Exec[postgres_add_ipv6_loopback_trust]],
hasstatus => true
}
single_exec {"create_ovirt_db":
command => "/usr/bin/createdb ovirt -U postgres",
- require => [Exec[postgres_add_all_trust], Service[postgresql]]
+ require => [Single_exec[postgres_add_all_trust],
Service[postgresql]]
}
single_exec {"create_ovirt_development_db":
command => "/usr/bin/createdb ovirt_development -U postgres",
- require => [Exec[postgres_add_all_trust], Service[postgresql]]
+ require => [Single_exec[postgres_add_all_trust],
Service[postgresql]]
}
postgres_execute_command {"ovirt_db_create_role":
@@ -67,7 +67,7 @@ class postgres::bundled{
require => Postgres_execute_command[ovirt_db_create_role]
}
- exec {"postgres_add_all_trust":
+ single_exec {"postgres_add_all_trust":
command => "/bin/echo 'local all all trust' >
/var/lib/pgsql/data/pg_hba.conf",
require => Single_exec[initialize_db],
notify => Service[postgresql]
@@ -75,13 +75,13 @@ class postgres::bundled{
exec {"postgres_add_localhost_trust":
command => "/bin/echo 'host all all 127.0.0.1 255.255.255.0 trust'
>> /var/lib/pgsql/data/pg_hba.conf",
- require => Exec[postgres_add_all_trust],
+ require => Single_exec[postgres_add_all_trust],
notify => Service[postgresql]
}
exec {"postgres_add_ipv6_loopback_trust":
command => "/bin/echo 'host all all ::1/128 trust' >>
/var/lib/pgsql/data/pg_hba.conf",
- require => Exec[postgres_add_all_trust],
+ require => Single_exec[postgres_add_all_trust],
notify => Service[postgresql]
}
