Merge pull request #1564 from puppetlabs/unbreak-debian-support-with-encoding

Unbreak Debian support with custom encoding

Author: amitkarsale

lib/puppet/type/postgresql_psql.rb

@@ -135,11 +135,7 @@ def matches(value)
   end
 
   autorequire(:anchor) do
-    ["postgresql::server::service::begin::#{self[:instance]}"]
-  end
-
-  autorequire(:service) do
-    ["postgresqld_instance_#{self[:instance]}"]
+    ["postgresql::server::service::end::#{self[:instance]}"]
   end
 
   def should_run_sql(refreshing = false)

manifests/server/instance/service.pp

@@ -42,6 +42,10 @@
       status    => $service_status,
     }
 
+    Anchor["postgresql::server::service::begin::${name}"]
+    -> Service["postgresqld_instance_${name}"]
+    -> Anchor["postgresql::server::service::end::${name}"]
+
     if $service_ensure in ['running', true] {
       # This blocks the class before continuing if chained correctly, making
       # sure the service really is 'up' before continuing.
@@ -56,10 +60,13 @@
         sleep            => 1,
         tries            => 60,
         psql_path        => $psql_path,
-        require          => Service["postgresqld_instance_${name}"],
-        before           => Anchor["postgresql::server::service::end::${name}"],
       }
-      Postgresql::Server::Database <| title == $default_database |> -> Postgresql_conn_validator["validate_service_is_running_instance_${name}"]
+
+      Anchor["postgresql::server::service::begin::${name}"]
+      -> Service["postgresqld_instance_${name}"]
+      -> Postgresql::Server::Database <| title == $default_database |>
+      -> Postgresql_conn_validator["validate_service_is_running_instance_${name}"]
+      -> Anchor["postgresql::server::service::end::${name}"]
     }
   }
 

manifests/server/plperl.pp

@@ -16,5 +16,5 @@
   -> Class['postgresql::server::install']
   -> Package['postgresql-plperl']
   -> Class['postgresql::server::service']
-  anchor { 'postgresql::server::plperl::end': }
+  -> anchor { 'postgresql::server::plperl::end': }
 }

spec/acceptance/utf8_encoding_spec.rb spec/acceptance/aaa_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'postgresql::server', skip: 'IAC-1286' do
+describe 'postgresql::server' do
   let(:pp) do
     <<-MANIFEST
       class { 'postgresql::globals':