Fix variables expand and postgresql template (#3411)

* Fix variables expand and postgresql template

Bug introduced in (f0f45d7)

.devcontainer/Dockerfile

@@ -48,6 +48,7 @@ RUN : INSTALL HELM BINARY \
  && aws --version
 
 RUN : INSTALL GEM REQUIREMENTS \
+ && gem install net-ssh -v 6.1.0 \
  && gem install \
     bcrypt_pbkdf ed25519 rake rspec_junit_formatter rubocop rubocop-junit_formatter serverspec solargraph
 

ansible/playbooks/roles/elasticsearch_curator/tasks/install-es-curator-Debian.yml

@@ -7,5 +7,5 @@
     state: present
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"

ansible/playbooks/roles/firewall/tasks/Debian/install-firewall.yml

@@ -16,8 +16,8 @@
     purge: true
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"
 
 - name: Install firewalld package
   block:
@@ -27,8 +27,8 @@
         state: present
       register: install_firewalld
       until: install_firewalld is succeeded
-      retries: "{{ specification.retries }}"
-      delay: "{{ specification.delay }}"
+      retries: "{{ retries }}"
+      delay: "{{ delay }}"
 
     - name: Stop and mask service for consistency with RHEL
       block:

ansible/playbooks/roles/grafana/tasks/install-packages-Debian.yml

@@ -5,5 +5,5 @@
     state: present
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"

ansible/playbooks/roles/haproxy_runc/tasks/install-packages-Debian.yml

@@ -8,5 +8,5 @@
     allow_downgrade: true
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"

ansible/playbooks/roles/postgres_exporter/tasks/main.yml

@@ -10,8 +10,8 @@
   when: ansible_os_family == 'Debian'
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"
 
 - name: Create postgres_exporter system group
   group:

ansible/playbooks/roles/postgresql/templates/postgresql.conf.j2

@@ -772,7 +772,9 @@ default_text_search_config = 'pg_catalog.english'
 #include_if_exists = '...'		# include file only if it exists
 #include = '...'			# include file
 include = 'postgresql-epiphany.conf'	# Epiphany managed configuration that overrides settings above
+{% if specification.custom_postgresql_config %}
 include_if_exists = '{{ specification.custom_postgresql_config }}'
+{% endif %}
 
 
 #------------------------------------------------------------------------------

ansible/playbooks/roles/rabbitmq/tasks/install-packages-debian.yml

@@ -26,5 +26,5 @@
     state: present
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"

ansible/playbooks/roles/repository/tasks/Debian/setup.yml

@@ -9,8 +9,8 @@
         cache_valid_time: 3600  # 1 h
       register: result
       until: result is succeeded
-      retries: "{{ specification.retries }}"
-      delay: "{{ specification.delay }}"
+      retries: "{{ retries }}"
+      delay: "{{ delay }}"
       when: not offline_mode
 
     - name: Create epirepo repository

ansible/playbooks/roles/upgrade/tasks/kubernetes/Debian/install-kubeadm.yml

@@ -38,8 +38,8 @@
           {{ packages_to_install.items() | map('join', '=') | list }}
       register: result
       until: result is succeeded
-      retries: "{{ specification.retries }}"
-      delay: "{{ specification.delay }}"
+      retries: "{{ retries }}"
+      delay: "{{ delay }}"
 
     - name: K8s/install | Include hold packages task
       include_tasks: hold-packages.yml

ansible/playbooks/roles/upgrade/tasks/kubernetes/Debian/install-packages.yml

@@ -9,8 +9,8 @@
      or packages_to_downgrade | length
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"
   vars:
     target_packages:
       kubeadm: "{{ version }}-00" # kubeadm may be removed as dependency and then has to be reinstalled
@@ -58,8 +58,8 @@
         state: absent
       register: result
       until: result is succeeded
-      retries: "{{ specification.retries }}"
-      delay: "{{ specification.delay }}"
+      retries: "{{ retries }}"
+      delay: "{{ delay }}"
       when: packages_to_downgrade | length
 
     - name: "K8s/install | Install packages: {{ packages_to_install_with_version | join( ', ' ) }}"

ansible/playbooks/roles/upgrade/tasks/legacy-haproxy/Debian/uninstall-haproxy.yml

@@ -6,5 +6,5 @@
     state: absent
   register: result
   until: result is succeeded
-  retries: "{{ specification.retries }}"
-  delay: "{{ specification.delay }}"
+  retries: "{{ retries }}"
+  delay: "{{ delay }}"

ci/ansible/playbooks/os/ubuntu/upgrade-release.yml

@@ -60,8 +60,8 @@
             upgrade: safe  # equivalent of 'apt upgrade'
           register: result
           until: result is succeeded
-          retries: "{{ specification.retries }}"
-          delay: "{{ specification.delay }}"
+          retries: "{{ retries }}"
+          delay: "{{ delay }}"
 
         # 4) Reboot the system (to use the latest kernel)
 
@@ -91,8 +91,8 @@
             purge: true
           register: result
           until: result is succeeded
-          retries: "{{ specification.retries }}"
-          delay: "{{ specification.delay }}"
+          retries: "{{ retries }}"
+          delay: "{{ delay }}"
 
         # 6) Upgrade OS release
 

schema/common/defaults/configuration/postgresql.yml

@@ -61,6 +61,10 @@ specification:
                 value: 10
                 comment: maximum number of simultaneously running WAL sender processes
                 when: replication
+              - name: max_replication_slots
+                value: 10
+                comment: maximum number of replication slots that a server can support
+                when: replication
               - name: wal_keep_size
                 value: 500
                 comment: the size of WAL files held for standby servers (MB)

tests/spec/spec/applications/rabbitmq/rabbitmq.rb

@@ -146,15 +146,13 @@ def callRabbitMQDeploymentTests
     describe 'Checking node health using RabbitMQ API' do
       service_replicas.times do |i|
         describe command("curl -o /dev/null -s -w '%{http_code}' -u #{user}#{i}:#{pass} \
-        #{host_inventory['hostname']}:#{service_management_port}/api/healthchecks/node/rabbit@$(kubectl describe pods rabbitmq-cluster-#{i} \
-        --namespace=#{service_namespace} | awk '/^IP:/ {print $2}')") do
+        #{host_inventory['hostname']}:#{service_management_port}/api/healthchecks/node/rabbit@rabbitmq-cluster-#{i}.#{service_name}.#{service_namespace}.svc.cluster.local") do
           it 'is expected to be equal' do
             expect(subject.stdout.to_i).to eq 200
           end
         end
         describe command("curl -u #{user}#{i}:#{pass} \
-        #{host_inventory['hostname']}:#{service_management_port}/api/healthchecks/node/rabbit@$(kubectl describe pods rabbitmq-cluster-#{i} \
-        --namespace=#{service_namespace} | awk '/^IP:/ {print $2}')") do
+        #{host_inventory['hostname']}:#{service_management_port}/api/healthchecks/node/rabbit@rabbitmq-cluster-#{i}.#{service_name}.#{service_namespace}.svc.cluster.local") do
           its(:stdout_as_json) { should include('status' => /ok/) }
           its(:stdout_as_json) { should_not include('status' => /failed/) }
           its(:exit_status) { should eq 0 }