From 1ce930157f20325844b551c7211c161cd33183b0 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 5 Jun 2017 00:16:30 -0400 Subject: [PATCH 1/2] minor readme fixes --- ansible/README.md | 2 +- terraform-digitalocean/README.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/README.md b/ansible/README.md index 1dee149e5..e76d15f1e 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -87,7 +87,7 @@ Mac OSX: sudo pip install dopy ``` -Amazon AWS inventory dependencies: +#### Amazon AWS inventory dependencies: Ubuntu/Debian: ``` diff --git a/terraform-digitalocean/README.md b/terraform-digitalocean/README.md index b6534794c..3833a5363 100644 --- a/terraform-digitalocean/README.md +++ b/terraform-digitalocean/README.md @@ -29,13 +29,15 @@ TESTNET_NAME="testnet-servers" terraform env new "$TESTNET_NAME" ``` +Note this `terraform env` command is only available in terraform `v0.9` and up. + ## Execution The below command will create 4 nodes in DigitalOcean. They will be named `testnet-servers-node0` to `testnet-servers-node3` and they will be tagged as `testnet-servers`. ``` DO_API_TOKEN="" SSH_IDS="[ \"\" ]" -terraform apply -var TESTNET_NAME="testnet-servers" -var servers=4 -var DO_API_TOKEN="$DO_API_TOKEN" -var ssh_keys=$SSH_IDS +terraform apply -var TESTNET_NAME="testnet-servers" -var servers=4 -var DO_API_TOKEN="$DO_API_TOKEN" -var ssh_keys="$SSH_IDS" ``` Note: `ssh_keys` is a list of strings. You can add multiple keys. For example: `["1234567","9876543"]`. From 44613da2b03dfce8bd5b8452b410996cc419645a Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 5 Jun 2017 00:33:30 -0400 Subject: [PATCH 2/2] ansible: update tendermint and basecoin versions --- ansible/group_vars/all | 4 ++-- ansible/roles/install-basecoin/defaults/main.yml | 2 +- ansible/roles/install-tendermint/defaults/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 61b08ab20..96537433f 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -11,7 +11,7 @@ ## tendermint_download stores the link to the specific tendermint release to install ## -#tendermint_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/tendermint/v0.10.0-rc1/tendermint_0.10.0-rc1_linux_amd64.zip" +#tendermint_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/tendermint/v0.10.0/tendermint_0.10.0_linux_amd64.zip" ## tendermint_binary stores the path to a private tendermint binary to install ## @@ -37,7 +37,7 @@ ## basecoin_download stores the link to the specific basecoin release to install ## -#basecoin_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/basecoin/v0.4.0/basecoin_0.4.0_linux_amd64.zip" +#basecoin_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/basecoin/v0.5.2/basecoin_0.5.2_linux_amd64.zip" ## basecoin_binary stores the path to a private basecoin binary to install ## diff --git a/ansible/roles/install-basecoin/defaults/main.yml b/ansible/roles/install-basecoin/defaults/main.yml index af0be1460..19153b937 100644 --- a/ansible/roles/install-basecoin/defaults/main.yml +++ b/ansible/roles/install-basecoin/defaults/main.yml @@ -1,6 +1,6 @@ --- basecoin_release_install: true -basecoin_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/basecoin/v0.4.0/basecoin_0.4.0_linux_amd64.zip" +basecoin_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/basecoin/v0.5.2/basecoin_0.5.2_linux_amd64.zip" basecoin_binary: "{{ lookup('env','GOPATH') | default('') }}/bin/basecoin" diff --git a/ansible/roles/install-tendermint/defaults/main.yml b/ansible/roles/install-tendermint/defaults/main.yml index ab1c114f6..6e93b8e6c 100644 --- a/ansible/roles/install-tendermint/defaults/main.yml +++ b/ansible/roles/install-tendermint/defaults/main.yml @@ -1,6 +1,6 @@ --- tendermint_release_install: true -tendermint_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/tendermint/v0.10.0-rc1/tendermint_0.10.0-rc1_linux_amd64.zip" +tendermint_download: "https://s3-us-west-2.amazonaws.com/tendermint/binaries/tendermint/v0.10.0/tendermint_0.10.0_linux_amd64.zip" tendermint_binary: "{{ lookup('env','GOPATH') | default('') }}/bin/tendermint"