Merge pull request #2118 from mboersma/fix-user-data

ref(user-data): "make discovery-url" copies from user-data.example

Author: Gabriel Monroy

.gitignore

@@ -57,12 +57,11 @@ Vagrantfile.local
 .bundle
 /__init__.py
 
+# Local user-data generated from user-data.example
+contrib/coreos/user-data
+
 # EC2 CloudFormation Setup
 contrib/ec2/cloudformation.json
 
 # GCE generated user-data
 contrib/gce/gce-user-data
-
-# user-data backup file
-contrib/coreos/user-data.orig
-

Makefile

@@ -17,8 +17,7 @@ dev-registry: check-docker
 	@echo "    export DEV_REGISTRY=`boot2docker ip 2>/dev/null`:5000"
 
 discovery-url:
-	sed -e "s,# discovery:,discovery:," -e "s,discovery: https://discovery.etcd.io/.*,discovery: $$(curl -s -w '\n' https://discovery.etcd.io/new)," contrib/coreos/user-data > contrib/coreos/user-data.new
-	mv contrib/coreos/user-data.new contrib/coreos/user-data
+	sed -e "s,# discovery:,discovery:," -e "s,discovery: https://discovery.etcd.io/.*,discovery: $$(curl -s -w '\n' https://discovery.etcd.io/new)," contrib/coreos/user-data.example > contrib/coreos/user-data
 
 build: check-docker
 	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) build &&) echo done

README.md

@@ -25,15 +25,15 @@ Note for Ubuntu users: the VirtualBox package in Ubuntu (as of the last known re
 
 ## Configure Discovery
 
-Each time you spin up a new CoreOS cluster, you **must** provide a new [discovery service URL](https://coreos.com/docs/cluster-management/setup/cluster-discovery/) in the [CoreOS user-data](https://coreos.com/docs/cluster-management/setup/cloudinit-cloud-config/) file.  This URL allows hosts to find each other and perform leader election.
+Each time you spin up a new CoreOS cluster, you **must** provide a new [discovery service URL](https://coreos.com/docs/cluster-management/setup/cluster-discovery/) in the [CoreOS user-data](https://coreos.com/docs/cluster-management/setup/cloudinit-cloud-config/) file. This unique discovery URL allows hosts to find each other and perform leader election.
 
-Automatically generate a fresh discovery URL with:
+Create a user-data file with a new discovery URL this way:
 
 ```console
 $ make discovery-url
 ```
 
-or manually edit [contrib/coreos/user-data](contrib/coreos/user-data) and add a unique discovery URL generated from <https://discovery.etcd.io/new>.
+Or copy [`contrib/coreos/user-data.example`](contrib/coreos/user-data.example) to `contrib/coreos/user-data` and follow the directions in the `etcd:` section to add a unique discovery URL.
 
 ## Boot CoreOS
 
@@ -201,7 +201,7 @@ Common issues that users have run into when provisioning Deis are detailed below
 Did you remember to add your SSH key to the ssh-agent? `ssh-add -L` should list the key you used to provision the servers. If it's not there, `ssh-add -K /path/to/your/key`.
 
 #### When running a `deisctl` command - 'All the given peers are not reachable (Tried to connect to each peer twice and failed)'
-The most common cause of this issue is that a [new discovery URL](https://discovery.etcd.io/new) wasn't generated and updated in [contrib/coreos/user-data](contrib/coreos/user-data) before the cluster was launched. Each Deis cluster must have a unique discovery URL, else there will be entries for old hosts that etcd will try and fail to connect to. Try destroying and relaunching the cluster with a fresh discovery URL.
+The most common cause of this issue is that a [new discovery URL](https://discovery.etcd.io/new) wasn't generated and updated in `contrib/coreos/user-data` before the cluster was launched. Each Deis cluster must have a unique discovery URL, or else `etcd` will try and fail to connect to old hosts. Try destroying the cluster and relaunching the cluster with a fresh discovery URL.
 
 #### Scaling an app doesn't work, and/or the app shows 'Welcome to nginx!'
 This usually means the controller failed to submit jobs to the scheduler. `deisctl journal controller` will show detailed error information, but the most common cause of this is that the cluster was created with the wrong SSH key for the `--auth` parameter. The key supplied with the `--auth` parameter must be the same key that was used to provision the Deis servers. If you suspect this to be the issue, you'll need to `clusters:destroy` the cluster and recreate it, along with the app.

Vagrantfile

@@ -123,6 +123,11 @@ Vagrant.configure("2") do |config|
           s.args = ["/tmp/vagrantfile-user-data", $num_instances]
         end
         config.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
+      else
+        config.vm.provision :shell do |s|
+          s.inline = "echo \"File not found: #{CLOUD_CONFIG_PATH}\" &&" +
+            "echo \"Run 'make discovery-url' first to create user-data.\" && exit 1"
+        end
       end
 
     end

contrib/bare-metal/README.md

@@ -12,8 +12,14 @@ $ ssh-keygen -q -t rsa -f ~/.ssh/deis -N '' -C deis
 ## Customize user-data
 
 ### Discovery URL
-Edit [user-data](../coreos/user-data) and add a new discovery URL.
-You can get a new one by sending a request to http://discovery.etcd.io/new.
+
+Create a user-data file with a new discovery URL this way:
+
+```console
+$ make discovery-url
+```
+
+Or copy [`contrib/coreos/user-data.example`](../coreos/user-data.example) to `contrib/coreos/user-data` and follow the directions in the `etcd:` section to add a unique discovery URL.
 
 ### SSH Key
 Add the public key part for the SSH key generated in the first step to the [user-data](../coreos/user-data) file:

contrib/bumpver/README.md

@@ -46,7 +46,7 @@ $ ./contrib/bumpver/bumpver 0.14.0 \
     deisctl/deis-version \
     deisctl/deisctl.go \
     deisctl/README.md \
-    contrib/coreos/user-data \
+    contrib/coreos/user-data.example \
     controller/deis/__init__.py \
     README.md
 ```

contrib/coreos/user-data contrib/coreos/user-data.examplecontrib/coreos/user-data renamed to contrib/coreos/user-data.example

@@ -1,7 +1,14 @@
 # Provision a Deis Cluster on DigitalOcean
 
-## Customize cloud-config.yml
-Edit [user-data](../coreos/user-data) and add a discovery URL. This URL will be used by all nodes in this Deis cluster. You can get a new discovery URL by sending a request to http://discovery.etcd.io/new.
+## Discovery URL
+
+Create a user-data file with a new discovery URL this way:
+
+```console
+$ make discovery-url
+```
+
+Or copy [`contrib/coreos/user-data.example`](../coreos/user-data.example) to `contrib/coreos/user-data` and follow the directions in the `etcd:` section to add a unique discovery URL.
 
 ## Install docl and authorize:
 The docl gem consumes the DigitalOcean API.

contrib/digitalocean/README.md

@@ -39,14 +39,14 @@ Deis clusters of less than 3 nodes are unsupported.
 
 ## Customize user-data
 
-Edit [user-data](../coreos/user-data) and add a new discovery URL.
-You can get a new one by sending a request to http://discovery.etcd.io/new, or automatically
-generate a fresh discovery URL with:
+Create a user-data file with a new discovery URL this way:
 
 ```console
 $ make discovery-url
 ```
 
+Or copy [`contrib/coreos/user-data.example`](../coreos/user-data.example) to `contrib/coreos/user-data` and follow the directions in the `etcd:` section to add a unique discovery URL.
+
 ## Customize cloudformation.json
 Any of the parameter defaults defined in deis.template.json can be overridden
 by setting the value in [cloudformation.json](cloudformation.json) like so:

contrib/ec2/README.md

@@ -35,8 +35,15 @@ Choose an existing keypair or upload a new public key, if desired.
 $ nova keypair-add --pub-key ~/.ssh/deis.pub deis-key
 ```
 
-### Customize cloud-config.yml
-Edit [user-data](../coreos/user-data) and add a discovery URL. This URL will be used by all nodes in this Deis cluster. You can get a new discovery URL by sending a request to http://discovery.etcd.io/new.
+### Customize user-data
+
+Create a user-data file with a new discovery URL this way:
+
+```console
+$ make discovery-url
+```
+
+Or copy [`contrib/coreos/user-data.example`](../coreos/user-data.example) to `contrib/coreos/user-data` and follow the directions in the `etcd:` section to add a unique discovery URL.
 
 ### Choose number of instances
 By default, the provision script will provision 3 servers. You can override this by setting `DEIS_NUM_INSTANCES`: