Skip to content

Commit 802e3a4

Browse files
authored
Add license headers (#124)
* Add license headers (#122) * Update public cloud/aws projects (#125) * Update links to ansible-navigator setup and cldr-runner FAQ * Update TF submodules to v0.3.0 for public-cloud/aws/datalake-tf * Rename play in public-cloud/aws/datalake-tf main.yml * Add TF lock files and SSH key artifacts to .gitignore in public-cloud/aws/datalake-tf * Update README for datalake-tf for relocated links and runtime parameters * Update the name of the teardown.yml play for datalake-tf Signed-off-by: Webster Mudge <[email protected]>
1 parent 1647749 commit 802e3a4

File tree

17 files changed

+155
-17
lines changed

17 files changed

+155
-17
lines changed

Diff for: public-cloud/aws/cde/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To run, you need:
1212

1313
## Set Up
1414

15-
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the top-level [README](../../../README.md#setting-up-ansible-navigator).
15+
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the [NAVIGATOR document](https://github.com/cloudera-labs/cldr-runner/blob/main/NAVIGATOR.md) in `cloudera-labs/cldr-runner`.
1616

1717
Then, clone this project and change your working directory.
1818

@@ -37,7 +37,8 @@ admin_password: "Secret" # 1 upper, 1 special, 1 number, 8-64 chars.
3737
infra_region: us-east-2
3838
```
3939
40-
NOTE: You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [FAQ](../../../FAQ.md#how-to-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
40+
> [!NOTE]
41+
> You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [cldr-runner FAQ](https://github.com/cloudera-labs/cldr-runner/blob/main/FAQ.md#how-do-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
4142

4243
### SSH Keys
4344

Diff for: public-cloud/aws/cdf/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To run, you need:
1212

1313
## Set Up
1414

15-
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the top-level [README](../../../README.md#setting-up-ansible-navigator).
15+
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the [NAVIGATOR document](https://github.com/cloudera-labs/cldr-runner/blob/main/NAVIGATOR.md) in `cloudera-labs/cldr-runner`.
1616

1717
Then, clone this project and change your working directory.
1818

@@ -37,7 +37,8 @@ admin_password: "Secret" # 1 upper, 1 special, 1 number, 8-64 chars.
3737
infra_region: us-east-2
3838
```
3939
40-
NOTE: You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [FAQ](../../../FAQ.md#how-to-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
40+
> [!NOTE]
41+
> You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [cldr-runner FAQ](https://github.com/cloudera-labs/cldr-runner/blob/main/FAQ.md#how-do-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
4142

4243
### SSH Keys
4344

Diff for: public-cloud/aws/cml/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To run, you need:
1212

1313
## Set Up
1414

15-
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the top-level [README](../../../README.md#setting-up-ansible-navigator).
15+
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the [NAVIGATOR document](https://github.com/cloudera-labs/cldr-runner/blob/main/NAVIGATOR.md) in `cloudera-labs/cldr-runner`.
1616

1717
Then, clone this project and change your working directory.
1818

@@ -37,7 +37,8 @@ admin_password: "Secret" # 1 upper, 1 special, 1 number, 8-64 chars.
3737
infra_region: us-east-2
3838
```
3939
40-
NOTE: You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [FAQ](../../../FAQ.md#how-to-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
40+
> [!NOTE]
41+
> You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [cldr-runner FAQ](https://github.com/cloudera-labs/cldr-runner/blob/main/FAQ.md#how-do-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
4142

4243
### SSH Keys
4344

Diff for: public-cloud/aws/datalake-tf/.gitignore

+8-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ context
1919
# Local .terraform directories
2020
**/.terraform/*
2121

22+
# .lock files
23+
**/*.terraform.lock.*
24+
2225
# .tfstate files
2326
**/*.tfstate
2427
**/*.tfstate.*
@@ -32,4 +35,8 @@ context
3235
# control as they are data points which are potentially sensitive and subject
3336
# to change depending on the environment.
3437
**/*.tfvars
35-
**/*.tfvars.json
38+
**/*.tfvars.json
39+
40+
# Exclude any generated SSH keys
41+
**/*.pem
42+
**/*.pub

Diff for: public-cloud/aws/datalake-tf/README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ To run, you need:
1414

1515
## Set Up
1616

17-
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the top-level [README](../../../README.md#setting-up-ansible-navigator).
17+
First, set up your `ansible-navigator` aka `cdp-navigator` environment -- follow the instructions in the [NAVIGATOR document](https://github.com/cloudera-labs/cldr-runner/blob/main/NAVIGATOR.md) in `cloudera-labs/cldr-runner`.
1818

1919
Then, clone this project and change your working directory.
2020

2121
```bash
22-
git clone https://github.com/cloudera-labs/cloudera-deploy.git; cd cloudera-deploy/public-cloud/aws/base
22+
git clone https://github.com/cloudera-labs/cloudera-deploy.git; cd cloudera-deploy/public-cloud/aws/datalake-tf
2323
```
2424

2525
## Configure
@@ -40,7 +40,8 @@ infra_region: us-east-2 # CSP region for infra
4040
deployment_template: public # Specify the deployment pattern below. Options are public, semi-private or private
4141
```
4242
43-
NOTE: You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e name_prefix=ex01`. See the [FAQ](../../../FAQ.md#how-to-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
43+
> [!NOTE]
44+
> You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [cldr-runner FAQ](https://github.com/cloudera-labs/cldr-runner/blob/main/FAQ.md#how-do-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
4445

4546
### SSH Keys
4647

@@ -51,7 +52,7 @@ This definition will create a new SSH keypair on the host of the name `<name_pre
5152
Then set up the CDP Public Cloud by running the playbook:
5253

5354
```bash
54-
ansible-navigator run main.yml
55+
ansible-navigator run main.yml -e @config.yml
5556
```
5657

5758
### Terraform resource files
@@ -65,5 +66,5 @@ Standard Terraform commands - e.g. `terraform output`, `terraform console`, can
6566
Tear down the CDP Public Cloud by running the playbook:
6667

6768
```bash
68-
ansible-navigator run teardown.yml
69+
ansible-navigator run teardown.yml -e @config.yml
6970
```

Diff for: public-cloud/aws/datalake-tf/config.yml

+15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
---
2+
3+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
217
name_prefix: "<ENTER_VALUE>" # You must specify a name prefix
318

419
infra_region: eu-west-1 # CSP region for infra

Diff for: public-cloud/aws/datalake-tf/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
- name: Set up the cloudera-deploy variables
17+
- name: Set up CDP Public Cloud infrastructure, Environment, and Datalake (Terraform-based)
1818
hosts: localhost
1919
connection: local
2020
gather_facts: no

Diff for: public-cloud/aws/datalake-tf/pbc_deploy_tf/main.tf

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
module "cdp_deploy" {
2-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.2.0"
16+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-deploy?ref=v0.3.0"
317

418
env_prefix = var.env_prefix
519
infra_type = "aws"

Diff for: public-cloud/aws/datalake-tf/pbc_deploy_tf/outputs.tf

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
output "cdp_environment_name" {
216
value = module.cdp_deploy.cdp_environment_name
317
}

Diff for: public-cloud/aws/datalake-tf/pbc_deploy_tf/variables.tf

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
# ------- Global settings -------
216
variable "aws_region" {
317
type = string

Diff for: public-cloud/aws/datalake-tf/pbc_infra_tf/main.tf

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
##### Terraform and Provider Configuration #####
216
terraform {
317
required_providers {
@@ -50,7 +64,7 @@ data "cdp_environments_aws_credential_prerequisites" "cdp_prereqs" {}
5064
##### Create the AWS pre-requisite resources for CDP #####
5165
# Using the terraform-cdp-aws-pre-reqs module
5266
module "cdp_aws_prereqs" {
53-
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs?ref=v0.2.0"
67+
source = "git::https://github.com/cloudera-labs/terraform-cdp-modules.git//modules/terraform-cdp-aws-pre-reqs?ref=v0.3.0"
5468

5569
env_prefix = var.env_prefix
5670
aws_region = var.aws_region

Diff for: public-cloud/aws/datalake-tf/pbc_infra_tf/outputs.tf

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
output "aws_key_name" {
216
value = aws_key_pair.cdp_keypair.key_name
317
}

Diff for: public-cloud/aws/datalake-tf/pbc_infra_tf/variables.tf

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
# ------- Global settings -------
216
variable "env_prefix" {
317
type = string

Diff for: public-cloud/aws/datalake-tf/teardown.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
- name: Set up the cloudera-deploy variables
17+
- name: Tear down CDP Public Cloud infrastructure, Environment, and Datalake (Terraform-based)
1818
hosts: localhost
1919
connection: local
2020
gather_facts: yes

Diff for: public-cloud/aws/datalake-tf/templates/cdp_aws_deploy.tfvars.j2

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
# ------- Global settings -------
216
env_prefix = "{{ name_prefix }}"
317
infra_type = "{{ infra_type }}"

Diff for: public-cloud/aws/datalake-tf/templates/cdp_aws_prereqs.tfvars.j2

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2023 Cloudera, Inc. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
# ------- Global settings -------
216
env_prefix = "{{ name_prefix }}"
317
aws_region = "{{ infra_region }}"

Diff for: public-cloud/aws/datalake/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ infra_region: us-east-2
3838
```
3939
4040
> [!NOTE]
41-
> You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [cldr-runner FAQ](https://github.com/cloudera-labs/cldr-runner/blob/main/FAQ.md#how-to-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
41+
> You can override these parameters with any typical Ansible _extra variables_ flags, i.e. `-e admin_password=my_password`. See the [cldr-runner FAQ](https://github.com/cloudera-labs/cldr-runner/blob/main/FAQ.md#how-do-i-add-extra-variables-and-tags-to-ansible-navigator) for details.
4242

4343
### SSH Keys
4444

0 commit comments

Comments
 (0)