Fix etcd mount race

jetstack · Jun 19, 2018 · 3d99073 · 3d99073
1 parent 726f3d7
commit 3d99073
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/puppet/modules/etcd/manifests/instance.pp b/puppet/modules/etcd/manifests/instance.pp
@@ -5,6 +5,7 @@
   Integer $members = 1,
   String $nodename= $::fqdn,
   Boolean $tls = false,
+  Boolean $external_disk = true,
   String $tls_cert_path = nil,
   String $tls_key_path = nil,
   String $tls_ca_path = nil,

diff --git a/puppet/modules/etcd/spec/acceptance/single_node_spec.rb b/puppet/modules/etcd/spec/acceptance/single_node_spec.rb
@@ -11,20 +11,23 @@
 etcd::instance{'k8s-main':
   version                  => '3.2.17',
   advertise_client_network => $advertise_client_network,
+  external_disk            => false,
 }
 
 etcd::instance{'k8s-events':
   version                  => '3.2.17',
   client_port              => 2389,
   peer_port                => 2390,
   advertise_client_network => $advertise_client_network,
+  external_disk            => false,
 }
 
 etcd::instance{'k8s-overlay':
   version                  => '3.2.17',
   client_port              => 2399,
   peer_port                => 2400,
   advertise_client_network => $advertise_client_network,
+  external_disk            => false,
 }
         EOS
 

diff --git a/puppet/modules/etcd/spec/acceptance/three_node_spec.rb b/puppet/modules/etcd/spec/acceptance/three_node_spec.rb
@@ -27,6 +27,7 @@
   members                  => $members,
   initial_cluster          => $initial_cluster,
   advertise_client_network => $advertise_client_network,
+  external_disk            => false,
 }
 
 etcd::instance{'k8s-events':
@@ -37,6 +38,7 @@
   advertise_client_network => $advertise_client_network,
   client_port              => 2389,
   peer_port                => 2390,
+  external_disk            => false,
 }
 
 etcd::instance{'k8s-overlay':
@@ -47,6 +49,7 @@
   advertise_client_network => $advertise_client_network,
   client_port              => 2399,
   peer_port                => 2400,
+  external_disk            => false,
 }
         EOS
 

diff --git a/puppet/modules/etcd/templates/etcd.service.erb b/puppet/modules/etcd/templates/etcd.service.erb
@@ -2,6 +2,10 @@
 Description=etcd server <%= @cluster_name %>
 Wants=network-online.target
 After=network.target network-online.target
+<% if @external_disk -%>
+After=var-lib-etcd.mount
+Requires=var-lib-etcd.mount
+<% end -%>
 
 [Service]
 User=<%= @user %>