From b78dc34ad3eb75a0cfc960b245a9bde26e4e426e Mon Sep 17 00:00:00 2001 From: Jesse Seldess Date: Wed, 4 May 2016 13:10:33 -0400 Subject: [PATCH 1/2] adding links and minor updates to deployment docs --- cloud-deployment.md | 9 ++++++++- manual-deployment.md | 8 +++++++- start-a-local-cluster.md | 4 +++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cloud-deployment.md b/cloud-deployment.md index b851e59129b..1db0f7b23be 100644 --- a/cloud-deployment.md +++ b/cloud-deployment.md @@ -3,4 +3,11 @@ title: Cloud Deployment toc: false --- -Coming soon. \ No newline at end of file +To deploy an insecure development or test cluster on Google Cloud Engine using [Terraform](https://www.terraform.io/), see the configuration files and instructions in the [gce directory](https://github.com/cockroachdb/cockroach/blob/master/cloud/gce) of our main cockroach GitHub repository. + +More cloud deployment docs coming soon. + +## See Also + +- [Manual Deployment](manual-deployment.html) +- [Start a Local Cluster](start-a-local-cluster.html) diff --git a/manual-deployment.md b/manual-deployment.md index 623c86fd155..8534c19d14e 100644 --- a/manual-deployment.md +++ b/manual-deployment.md @@ -5,7 +5,7 @@ toc: false This page shows you how to manually deploy a multi-node CockroachDB cluster on multiple machines. -{{site.data.alerts.callout_info}} For deployment on AWS and other cloud providers, see Cloud Deployment. For local testing and development, see Start a Local Cluster.{{site.data.alerts.end}} +{{site.data.alerts.callout_info}} For testing and development, you can Start a Local Cluster or Deploy on Google Cloud Engine using Terraform. You can also Run CockroachDB inside a VirtualBox VM (community-supported).{{site.data.alerts.end}}
@@ -221,3 +221,9 @@ store[0]: path=cockroach-data ~~~ + +## See Also + +- [Cloud Deployment](cloud-deployment.html) +- [Start a Local Cluster](start-a-local-cluster.html) +- [Run CockroachDB in a VirtualBox VM](http://uptimedba.github.io/cockroach-vb-single/cockroach-vb-single/home.html) (community-supported) diff --git a/start-a-local-cluster.md b/start-a-local-cluster.md index 29921cef801..b8bb660d2c3 100644 --- a/start-a-local-cluster.md +++ b/start-a-local-cluster.md @@ -4,7 +4,9 @@ toc: false expand: true --- -Once you've [installed CockroachDB](install-cockroachdb.html), you can quickly start a single- or multi-node cluster locally with each node listening on a different port. For details about running CockroachDB on multiple machines or in the cloud, see Manual Deployment or Cloud Deployment. +Once you've [installed CockroachDB](install-cockroachdb.html), you can quickly start a single- or multi-node cluster locally with each node listening on a different port. + +{{site.data.alerts.callout_info}}To run CockroachDB on multiple machines, see Manual Deployment. For guidance on running CockroachDB inside a single VirtualBox virtual machine, see these community-supported docs.{{site.data.alerts.end}} 1. From the directory with the `cockroach` binary, start your first node: From 87a8d2f7b540f4c7fdae3735cfd2bc0d70d0efcc Mon Sep 17 00:00:00 2001 From: Jesse Seldess Date: Wed, 4 May 2016 13:36:20 -0400 Subject: [PATCH 2/2] revisions for marc --- cloud-deployment.md | 2 +- manual-deployment.md | 2 +- start-a-local-cluster.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud-deployment.md b/cloud-deployment.md index 1db0f7b23be..5ea1ad4dba4 100644 --- a/cloud-deployment.md +++ b/cloud-deployment.md @@ -3,7 +3,7 @@ title: Cloud Deployment toc: false --- -To deploy an insecure development or test cluster on Google Cloud Engine using [Terraform](https://www.terraform.io/), see the configuration files and instructions in the [gce directory](https://github.com/cockroachdb/cockroach/blob/master/cloud/gce) of our main cockroach GitHub repository. +To deploy an insecure development or test cluster on Google Cloud Engine or AWS using [Terraform](https://www.terraform.io/), see the configuration files and instructions in the [`gce`](https://github.com/cockroachdb/cockroach/blob/master/cloud/gce) and [`aws`](https://github.com/cockroachdb/cockroach/blob/master/cloud/aws) directories of our main cockroach GitHub repository. More cloud deployment docs coming soon. diff --git a/manual-deployment.md b/manual-deployment.md index 8534c19d14e..ea0c329aa05 100644 --- a/manual-deployment.md +++ b/manual-deployment.md @@ -5,7 +5,7 @@ toc: false This page shows you how to manually deploy a multi-node CockroachDB cluster on multiple machines. -{{site.data.alerts.callout_info}} For testing and development, you can Start a Local Cluster or Deploy on Google Cloud Engine using Terraform. You can also Run CockroachDB inside a VirtualBox VM (community-supported).{{site.data.alerts.end}} +{{site.data.alerts.callout_info}} For testing and development, you can Start a Local Cluster or Deploy on GCE or AWS using Terraform. You can also Run CockroachDB inside a VirtualBox VM (community-supported).{{site.data.alerts.end}}
diff --git a/start-a-local-cluster.md b/start-a-local-cluster.md index b8bb660d2c3..ab9760a68ba 100644 --- a/start-a-local-cluster.md +++ b/start-a-local-cluster.md @@ -6,7 +6,7 @@ expand: true Once you've [installed CockroachDB](install-cockroachdb.html), you can quickly start a single- or multi-node cluster locally with each node listening on a different port. -{{site.data.alerts.callout_info}}To run CockroachDB on multiple machines, see Manual Deployment. For guidance on running CockroachDB inside a single VirtualBox virtual machine, see these community-supported docs.{{site.data.alerts.end}} +{{site.data.alerts.callout_info}}To run CockroachDB on multiple machines or in the cloud, see Manual Deployment or Cloud Deployment. To run CockroachDB inside a single VirtualBox virtual machine, see these community-supported docs.{{site.data.alerts.end}} 1. From the directory with the `cockroach` binary, start your first node: