Merge pull request #769 from simonswine/automated-cherry-pick-of-#766-#767-#768-release-0.6

Automated cherry pick of #766 #767 #768

Author: jetstack-bot

puppet/hieradata/common.yaml

@@ -35,6 +35,7 @@ consul::backup_bucket_prefix: "%{::consul_backup_bucket_prefix}"
 consul::private_ip: "%{::vault_private_ip}"
 consul::cloud_provider: aws
 consul::backup_schedule: "%{::consul_backup_schedule}"
+consul::datacenter: "%{::vault_region}"
 
 vault_server::region: "%{::vault_region}"
 vault_server::environment: "%{::vault_environment}"

puppet/modules/aws_ebs/manifests/mount.pp

@@ -17,7 +17,7 @@
   String $dest_path,
   String $device,
   Boolean $is_not_attached,
-  Enum['xfs'] $filesystem = 'xfs',
+  Enum['xfs', 'ext4'] $filesystem = 'xfs',
 ){
   require ::aws_ebs
 

puppet/modules/aws_ebs/spec/defines/mount_spec.rb

@@ -43,7 +43,7 @@
 
     it 'should contain mount service' do
       should contain_service(mount_service_name).that_requires("Service[#{format_service_name}]")
-      should contain_file("/etc/systemd/system/#{mount_service_name}").with_content(%r{Type=xfs})
+      should contain_file("/etc/systemd/system/#{mount_service_name}").with_content(%r{Type=auto})
       should contain_file("/etc/systemd/system/#{mount_service_name}").with_content(%r{Where=/mnt/folder/test1})
       should contain_file("/etc/systemd/system/#{mount_service_name}").with_content(%r{What=/dev/xvdy})
     end

puppet/modules/aws_ebs/templates/ensure-volume-formatted.service.erb

@@ -8,7 +8,7 @@ After=<%= @attach_service_name %>
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=<%= scope['aws_ebs::format_bin_path'] %> <%= @device %>
+ExecStart=<%= scope['aws_ebs::format_bin_path'] %> <%= @device %> <%= @filesystem %>
 
 [Install]
 WantedBy=multiuser.target

puppet/modules/aws_ebs/templates/ensure_volume_formatted.sh.erb

@@ -2,5 +2,6 @@
 
 PATH=/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin
 DEVICE=$1
+FILESYSTEM=$2
 
-blkid "${DEVICE}" || (wipefs -fa "${DEVICE}" && mkfs.xfs "${DEVICE}")
+blkid "${DEVICE}" || (wipefs -fa "${DEVICE}" && mkfs.${FILESYSTEM} "${DEVICE}")

puppet/modules/aws_ebs/templates/volume.mount.erb

@@ -6,7 +6,7 @@ After=<%= @format_service_name %>
 [Mount]
 What=<%= @device %>
 Where=<%= @dest_path %>
-Type=<%= @filesystem %>
+Type=auto
 
 [Install]
 WantedBy=multiuser.target

puppet/modules/consul/files/consul-detect-existing-datacenter.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+set -x
+
+CONSUL_DATACENTER=$(strings -n1 $1/data/raft/raft.db | grep Datacenter -A1 | head -n2 | tail -n 1)
+
+if [ -z "${CONSUL_DATACENTER}" ]; then
+  echo "{}"
+else
+  echo "{\"datacenter\":\"${CONSUL_DATACENTER}\",\"acl_datacenter\":\"${CONSUL_DATACENTER}\"}"
+fi

puppet/modules/consul/manifests/install.pp

@@ -129,6 +129,12 @@
     target => "${consul::_backinator_dest_dir}/consul-backinator",
   }
 
+  file { "${consul::_dest_dir}/consul-detect-existing-datacenter.sh":
+    ensure  => file,
+    content => file('consul/consul-detect-existing-datacenter.sh'),
+    mode    => '0755'
+  }
+
   file { "${consul::_dest_dir}/consul-backup.sh":
     ensure  => file,
     content => file('consul/consul-backup.sh'),

puppet/modules/consul/manifests/service.pp

@@ -26,6 +26,8 @@
 
   $bin_path = $consul::bin_path
   $config_path = $consul::config_path
+  $config_datacenter_override_path = "${consul::config_dir}/consul-datacenter.json"
+  $consul_detect_existing_datacenter_path = "${consul::_dest_dir}/consul-detect-existing-datacenter.sh"
 
   $consul_encrypt = $consul::_consul_encrypt
   $consul_master_token = $consul::_consul_master_token

puppet/modules/consul/templates/consul.service.erb

@@ -26,9 +26,12 @@ ExecStartPre=/bin/chown -c root:<%= @group %> <%= @data_dir %>
 ExecStartPre=/bin/chmod 0750 <%= @data_dir%>
 ExecStartPre=/bin/chown -cR <%= @user %>:<%= @group %> <%= @data_dir %>/data
 ExecStartPre=/bin/chmod 0750 <%= @data_dir %>/data
+# detect an already existing datacenter setting
+ExecStartPre=/bin/sh -c ". <%= @consul_detect_existing_datacenter_path %> <%= @data_dir %> > <%= @config_datacenter_override_path %>"
 ExecStart=<%= @bin_path %> \
    agent \
    -config-file=<%= @config_path %> \
+   -config-file=<%= @config_datacenter_override_path %> \
    -data-dir=<%= @data_dir %>/data
 Restart=on-failure
 RestartSec=10