mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 02:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #448 from polvi/etcd-refactor-again

Browse Source 
fix(c10n): so close, use correct discovery url var
This commit is contained in:
polvi 2014-03-18 12:15:46 -07:00
commit 4aca9d1bbf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/coreos-c10n vendored
View File

@ -86,7 +86,7 @@ fi
if [ -n "${ETCD_DISCOVERY_URL}" ]; then if [ -n "${ETCD_DISCOVERY_URL}" ]; then
echo "Using '${ETCD_DISCOVERY_URL}' as etcd discovery url" echo "Using '${ETCD_DISCOVERY_URL}' as etcd discovery url"
echo "[Service] echo "[Service]
Environment=ETCD_DISCOVERY=${ETCD_DISCOVERY} Environment=ETCD_DISCOVERY=${ETCD_DISCOVERY_URL}
Environment=ETCD_NAME=${IP}" > ${ETCD_SERVICE_D}/21-c10n.conf Environment=ETCD_NAME=${IP}" > ${ETCD_SERVICE_D}/21-c10n.conf
# ...otherwise, we treat the provided user-data as a legacy c10n URL # ...otherwise, we treat the provided user-data as a legacy c10n URL
elif [ -n "${C10N_TOKEN}" ]; then elif [ -n "${C10N_TOKEN}" ]; then