github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4021 from justinsb/fix_etcd_datadir_must_be_empty

Browse Source 
Etcd data dir must be empty
This commit is contained in:
Brendan Burns 2015-02-02 10:48:44 -08:00
commit 0e74660d08
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/etcd/default
View File

@ -3,4 +3,4 @@
{% set etcd_servers = grains.etcd_servers -%} {% set etcd_servers = grains.etcd_servers -%}
{% endif -%} {% endif -%}
DAEMON_ARGS="-addr {{etcd_servers}}:4001 -bind-addr {{etcd_servers}}:4001 -data-dir /var/etcd" DAEMON_ARGS="-addr {{etcd_servers}}:4001 -bind-addr {{etcd_servers}}:4001 -data-dir /var/etcd/data"

2
cluster/saltbase/salt/etcd/etcd.conf
View File

@ -1,4 +1,4 @@
bind_addr = "0.0.0.0" bind_addr = "0.0.0.0"
peer_bind_addr = "0.0.0.0" peer_bind_addr = "0.0.0.0"
data_dir = "/var/etcd" data_dir = "/var/etcd/data"
max_retry_attempts = 60 max_retry_attempts = 60

10
cluster/saltbase/salt/etcd/init.sls
View File

@ -84,6 +84,15 @@ etcd:
- user: etcd - user: etcd
- group: etcd - group: etcd
/var/etcd/data:
file.directory:
- user: etcd
- group: etcd
- dir_mode: 700
- require:
- user: etcd
- group: etcd
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' %}
/etc/default/etcd: /etc/default/etcd:
@ -125,6 +134,7 @@ etcd-service:
- file: etcd-symlink - file: etcd-symlink
- require: - require:
- file: /var/etcd - file: /var/etcd
- file: /var/etcd/data
- user: etcd - user: etcd
- group: etcd - group: etcd

2
cluster/saltbase/salt/etcd/initd
View File

@ -18,7 +18,7 @@ NAME=etcd
DAEMON=/usr/local/bin/$NAME DAEMON=/usr/local/bin/$NAME
# DAEMON_ARGS="-peer-addr $HOSTNAME:7001 -name $HOSTNAME" # DAEMON_ARGS="-peer-addr $HOSTNAME:7001 -name $HOSTNAME"
host_ip=$(hostname -i) host_ip=$(hostname -i)
DAEMON_ARGS="-addr ${host_ip}:4001 -bind-addr ${host_ip}:4001 -data-dir /var/etcd -initial-advertise-peer-urls http://${HOSTNAME}:2380 -name ${HOSTNAME} -initial-cluster ${HOSTNAME}=http://${HOSTNAME}:2380" DAEMON_ARGS="-addr ${host_ip}:4001 -bind-addr ${host_ip}:4001 -data-dir /var/etcd/data -initial-advertise-peer-urls http://${HOSTNAME}:2380 -name ${HOSTNAME} -initial-cluster ${HOSTNAME}=http://${HOSTNAME}:2380"
DAEMON_LOG_FILE=/var/log/$NAME.log DAEMON_LOG_FILE=/var/log/$NAME.log
PIDFILE=/var/run/$NAME.pid PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME