Skip to content
This repository was archived by the owner on Mar 29, 2023. It is now read-only.

Commit 484a14d

Browse files
authored
Merge pull request #22 from gruntwork-io/small-fixes
Replace vars.tf with variables.tf
2 parents 804eebb + 2e84839 commit 484a14d

File tree

7 files changed

+22
-14
lines changed

7 files changed

+22
-14
lines changed

examples/couchbase-cluster-mds/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ To deploy a Couchbase Cluster:
2828
[couchbase-ami example](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-ami)
2929
documentation for instructions. Make sure to note down the ID of the AMI.
3030
1. Install [Terraform](https://www.terraform.io/).
31-
1. Open `vars.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
31+
1. Open `variables.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
3232
don't have a default. If you built a custom AMI, put its ID into the `ami_id` variable. If you didn't, this example
3333
will use public AMIs that Gruntwork has published, which are fine for testing/learning, but not recommended for
3434
production use.
@@ -42,7 +42,9 @@ To deploy a Couchbase Cluster:
4242

4343
Check out [How do you connect to the Couchbase
4444
cluster](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/modules/couchbase-cluster#how-do-you-connect-to-the-couchbase-cluster)
45-
documentation.
45+
documentation. To log into the Couchbase Web Console, use the username and password from the `cluster_username`
46+
and `cluster_password` vars in
47+
[user-data-couchbase-data-nodes.sh](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-cluster-mds/user-data/user-data-couchbase-data-nodes.sh).
4648

4749
Note that booting up and rebalancing a Couchbase cluster can take 5 - 10 minutes, depending on the number and types of
4850
instances.

examples/couchbase-cluster-simple-dns-tls/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This folder shows an example of Terraform code that uses the
55
module to deploy a [Couchbase](https://www.couchbase.com/) cluster in [AWS](https://aws.amazon.com/). The cluster
66
consists of one Auto Scaling Group (ASG) that runs all Couchbase services and Sync Gateway:
77

8-
![Couchbase single-cluster architecture](https://github.com/gruntwork-io/terraform-aws-couchbase/blob/master/_docs/couchbase-cluster-simple-architecture.png?raw=true)
8+
![Couchbase single-cluster architecture](https://github.com/gruntwork-io/terraform-aws-couchbase/blob/master/_docs/couchbase-single-cluster-architecture.png?raw=true)
99

1010
This example also deploys a Load Balancer in front of the Couchbase cluster, and configures SSL/DNS for it (see [DNS
1111
and SSL](#dns-and-ssl)), using the [load-balancer
@@ -31,7 +31,7 @@ To deploy a Couchbase Cluster:
3131
[couchbase-ami example](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-ami)
3232
documentation for instructions. Make sure to note down the ID of the AMI.
3333
1. Install [Terraform](https://www.terraform.io/).
34-
1. Open `vars.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
34+
1. Open `variables.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
3535
don't have a default. If you built a custom AMI, put its ID into the `ami_id` variable. If you didn't, this example
3636
will use public AMIs that Gruntwork has published, which are fine for testing/learning, but not recommended for
3737
production use.
@@ -45,6 +45,8 @@ To deploy a Couchbase Cluster:
4545
Check out [How do you connect to the Couchbase
4646
cluster](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/modules/couchbase-cluster#how-do-you-connect-to-the-couchbase-cluster)
4747
documentation. Note that this module uses SSL, so make sure to use `https://` instead of `http://` for all URLs!
48+
To log into the Couchbase Web Console, use the username and password from the `cluster_username`and `cluster_password`
49+
vars in [user-data.sh](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-cluster-simple-dns-tls/user-data/user-data.sh).
4850

4951
Note that booting up and rebalancing a Couchbase cluster can take 5 - 10 minutes, depending on the number and types of
5052
instances.

examples/couchbase-cluster-simple/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ To deploy a Couchbase Cluster:
3030
[couchbase-ami example](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-ami)
3131
documentation for instructions. Make sure to note down the ID of the AMI.
3232
1. Install [Terraform](https://www.terraform.io/).
33-
1. Open `vars.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
33+
1. Open `variables.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
3434
don't have a default. If you built a custom AMI, put its ID into the `ami_id` variable. If you didn't, this example
3535
will use public AMIs that Gruntwork has published, which are fine for testing/learning, but not recommended for
3636
production use.
@@ -43,7 +43,9 @@ To deploy a Couchbase Cluster:
4343

4444
Check out [How do you connect to the Couchbase
4545
cluster](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/modules/couchbase-cluster#how-do-you-connect-to-the-couchbase-cluster)
46-
documentation.
46+
documentation. To log into the Couchbase Web Console, use the username and password from the `cluster_username`
47+
and `cluster_password` vars in
48+
[user-data.sh](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-cluster-simple/user-data/user-data.sh).
4749

4850
Note that booting up and rebalancing a Couchbase cluster can take 5 - 10 minutes, depending on the number and types of
4951
instances.

examples/couchbase-multi-datacenter-replication/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ To deploy a Couchbase Cluster:
2424
1. Optional: build custom Couchbase AMIs. See the
2525
[couchbase-ami example](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-ami)
2626
documentation for instructions. Note that you'll need to build one AMI in each of the regions specified in
27-
`vars.tf`: `aws_region_primary` and `aws_region_replica`:
27+
`variables.tf`: `aws_region_primary` and `aws_region_replica`:
2828

2929
```
3030
packer build -var aws_region=us-east-1 -only=ubuntu-ami couchbase.json
3131
packer build -var aws_region=us-west-1 -only=ubuntu-ami couchbase.json
3232
```
3333
3434
1. Install [Terraform](https://www.terraform.io/).
35-
1. Open `vars.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
35+
1. Open `variables.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
3636
don't have a default. If you built custom AMIs, put their IDs into the `ami_id_primary` and `ami_id_replica`
3737
variables. If you didn't, this example will use public AMIs that Gruntwork has published, which are fine for
3838
testing/learning, but not recommended for production use.
@@ -46,7 +46,9 @@ To deploy a Couchbase Cluster:
4646
4747
Check out [How do you connect to the Couchbase
4848
cluster](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/modules/couchbase-cluster#how-do-you-connect-to-the-couchbase-cluster)
49-
documentation. Note that this module uses SSL, so make sure to use `https://` instead of `http://` for all URLs!
49+
documentation. To log into the Couchbase Web Console, use the username and password from the `cluster_username`
50+
and `cluster_password` vars in
51+
[user-data-primary.sh](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples/couchbase-multi-datacenter-replication/user-data/user-data-primary.sh).
5052
5153
Note that booting up and rebalancing a Couchbase cluster can take 5 - 10 minutes, depending on the number and types of
5254
instances.

modules/couchbase-cluster/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module "couchbase_cluster" {
3232
/opt/couchbase/bin/run-couchbase-server --username admin --password password
3333
EOF
3434
35-
# ... See vars.tf for the other parameters you must define for the couchbase-cluster module
35+
# ... See variables.tf for the other parameters you must define for the couchbase-cluster module
3636
}
3737
```
3838

@@ -58,7 +58,7 @@ Note the following parameters:
5858
[run-sync-gateway](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/modules/run-sync-gateway)
5959
scripts to configure and run Couchbase and/or Sync Gateway.
6060

61-
You can find the other parameters in [vars.tf](vars.tf).
61+
You can find the other parameters in [variables.tf](variables.tf).
6262

6363
Check out the [examples folder](https://github.com/gruntwork-io/terraform-aws-couchbase/tree/master/examples) for
6464
fully-working sample code.

modules/load-balancer-target-group/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module "couchbase_target_group" {
7575
# server
7676
enable_stickiness = true
7777
78-
# ... See vars.tf for the other parameters you must define for this module
78+
# ... See variables.tf for the other parameters you must define for this module
7979
}
8080
8181
module "sync_gateway_target_group" {
@@ -91,7 +91,7 @@ module "sync_gateway_target_group" {
9191
num_listener_arns = 1
9292
listener_rule_starting_priority = 100
9393
94-
# ... See vars.tf for the other parameters you must define for this module
94+
# ... See variables.tf for the other parameters you must define for this module
9595
}
9696
```
9797

modules/load-balancer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module "load_balancer" {
4747
allow_
4848
inbound_from_cidr_blocks = ["0.0.0.0/0"]
4949
50-
# ... See vars.tf for the other parameters you must define for this module
50+
# ... See variables.tf for the other parameters you must define for this module
5151
}
5252
```
5353

0 commit comments

Comments
 (0)