Skip to content

Commit 5bc1c80

Browse files
mboersmaGabriel Monroy
authored andcommitted
fix(user-data): add fixed version of sed command to "make discovery-url"
1 parent 102b036 commit 5bc1c80

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,7 @@ contrib/ec2/cloudformation.json
6262

6363
# GCE generated user-data
6464
contrib/gce/gce-user-data
65+
66+
# user-data backup file
67+
contrib/coreos/user-data.orig
68+

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ dev-registry: check-docker
1515
@echo "To configure the registry for local Deis development:"
1616
@echo " export DEIS_REGISTRY=`boot2docker ip 2>/dev/null`:5000"
1717

18+
discovery-url:
19+
sed -i .orig -e "s,# discovery: https://discovery.etcd.io/12345693838asdfasfadf13939923,discovery: $$(curl -q -w '\n' https://discovery.etcd.io/new)," contrib/coreos/user-data
20+
1821
build: check-docker
1922
@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) build ;)
2023

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Each time you spin up a new CoreOS cluster, you **must** provide a new [discover
2929
Automatically generate a fresh discovery URL with:
3030

3131
```console
32-
$ sed -i -e "s,# discovery: https://discovery.etcd.io/12345693838asdfasfadf13939923,discovery: $(curl -q -w '\n' https://discovery.etcd.io/new)," contrib/coreos/user-data
32+
$ sed -i .orig -e "s,# discovery: https://discovery.etcd.io/12345693838asdfasfadf13939923,discovery: $(curl -q -w '\n' https://discovery.etcd.io/new)," contrib/coreos/user-data
3333
```
3434

3535
or manually edit [contrib/coreos/user-data](contrib/coreos/user-data) and add a unique discovery URL generated from <https://discovery.etcd.io/new>.

0 commit comments

Comments
 (0)