Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
eytannnaim committed Jul 9, 2023
1 parent 89646cc commit 03450d1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/terraform_apply_cli_dam_poc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ jobs:
- name: Terraform Plan
run: |
terraform -chdir=$EXAMPLE_DIR workspace list
terraform -chdir=$EXAMPLE_DIR plan -var license_file=license.mprv
terraform -chdir=$EXAMPLE_DIR plan -var license=license.mprv
# On push to "main", build or change infrastructure according to Terraform configuration files
# Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks
- name: Terraform Apply
# if: github.ref == 'refs/heads/"master"' && github.event_name == 'push' || github.event_name == 'workflow_dispatch'
run: terraform -chdir=$EXAMPLE_DIR apply -var license_file=license.mprv -auto-approve
run: terraform -chdir=$EXAMPLE_DIR apply -var license=license.mprv -auto-approve

- name: Terraform Output
if: always()
Expand All @@ -169,7 +169,7 @@ jobs:
- name: Terraform Destroy
id: destroy
if: always()
run: terraform -chdir=$EXAMPLE_DIR destroy -var license_file=license.mprv -auto-approve
run: terraform -chdir=$EXAMPLE_DIR destroy -var license=license.mprv -auto-approve

- name: Terraform Delete Workspace
if: always()
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/terraform_apply_cli_dsf_poc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ jobs:
- name: Terraform Plan
run: |
terraform -chdir=$EXAMPLE_DIR workspace list
terraform -chdir=$EXAMPLE_DIR plan -var license_file=license.mprv
terraform -chdir=$EXAMPLE_DIR plan -var license=license.mprv
# On push to "main", build or change infrastructure according to Terraform configuration files
# Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks
- name: Terraform Apply
# if: github.ref == 'refs/heads/"master"' && github.event_name == 'push' || github.event_name == 'workflow_dispatch'
run: terraform -chdir=$EXAMPLE_DIR apply -var license_file=license.mprv -auto-approve
run: terraform -chdir=$EXAMPLE_DIR apply -var license=license.mprv -auto-approve

- name: Terraform Output
if: always()
Expand All @@ -144,7 +144,7 @@ jobs:
- name: Terraform Destroy
id: destroy
if: always()
run: terraform -chdir=$EXAMPLE_DIR destroy -var license_file=license.mprv -auto-approve
run: terraform -chdir=$EXAMPLE_DIR destroy -var license=license.mprv -auto-approve

- name: Terraform Delete Workspace
if: always()
Expand Down
4 changes: 2 additions & 2 deletions modules/aws/mx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The following input variables are **required**:
* `mx_password`: MX password
* `secure_password`: The password used for communication between the Management Server and the Agent Gateway
* `dam_version`: Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)
* `license_file`: DAM license file path. Make sure this license is valid before deploying DAM otherwise this will result in an invalid deployment and loss of time
* `license`: DAM license file path or activation key. Make sure this license is valid before deploying DAM otherwise this will result in an invalid deployment and loss of time

Refer to [variables.tf](variables.tf) for additional variables with default values and additional info.

Expand All @@ -57,7 +57,7 @@ module "mx" {
mx_password = var.mx_password
secure_password = var.secure_password
dam_version = var.dam_version
license_file = var.license_file
license = var.license
allowed_all_cidrs = [data.aws_vpc.selected.cidr_block]
}
```
Expand Down

0 comments on commit 03450d1

Please sign in to comment.