Merge pull request #2662 from benmoss/master

dadgar · web-flow · commit 98c6c3930298 · 2017-05-21T16:27:00.000-07:00
Make example clients generate random HostIDs
diff --git a/demo/vagrant/client1.hcl b/demo/vagrant/client1.hcl
@@ -23,6 +23,7 @@ client {
     reserved {
        cpu = 500
     }
+    no_host_uuid = true
 }
 
 # Modify our port to avoid a collision with server1
diff --git a/demo/vagrant/client2.hcl b/demo/vagrant/client2.hcl
@@ -18,6 +18,7 @@ client {
     meta {
         ssd = "true"
     }
+    no_host_uuid = true
 }
 
 # Modify our port to avoid a collision with server1 and client1

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ client {`
`23`	`23`	`reserved {`
`24`	`24`	`cpu = 500`
`25`	`25`	`}`
	`26`	`+ no_host_uuid = true`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`# Modify our port to avoid a collision with server1`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ client {`
`18`	`18`	`meta {`
`19`	`19`	`ssd = "true"`
`20`	`20`	`}`
	`21`	`+ no_host_uuid = true`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`# Modify our port to avoid a collision with server1 and client1`