Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test PR #335

Open
wants to merge 7 commits into
base: test
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Hashicat: A terraform built application for use in Hashicorp workshops.
Includes the "Meow World" website. 😻

[![CircleCI](https://circleci.com/gh/hashicorp/hashicat-azure.svg?style=svg)](https://circleci.com/gh/hashicorp/hashicat-azure)
Eslam Mahmoud
4 changes: 2 additions & 2 deletions files/deploy_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ cat << EOM > /var/www/html/index.html
<!-- BEGIN -->
<center><img src="http://${PLACEHOLDER}/${WIDTH}/${HEIGHT}"></img></center>
<center><h2>Meow World!</h2></center>
Welcome to ${PREFIX}'s app. Replace this text with your own.
This is a catchy slogan :d.
<!-- END -->

</div>
</body>
</html>
EOM

echo "Script complete."
echo "Script complete."
5 changes: 4 additions & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ resource "azurerm_virtual_machine" "catapp" {
disable_password_authentication = false
}

tags = {}
tags = {
Department = "devops"
Billable = "true"
}

# Added to allow destroy to work correctly.
depends_on = [azurerm_network_interface_security_group_association.catapp-nic-sg-ass]
Expand Down
5 changes: 5 additions & 0 deletions network.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module "network" {
source = "app.terraform.io/TF_Training_Eslam/network/azurerm"
Eslam10 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test

version = "3.5.0"
resource_group_name = azurerm_resource_group.myresourcegroup.name
}
9 changes: 9 additions & 0 deletions remote_backend.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
terraform {
backend "remote" {
hostname = "app.terraform.io"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addd

organization = "TF_Training_Eslam"
workspaces {
name = "hashicat-azure"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addd

}
}
}
5 changes: 0 additions & 5 deletions terraform.tfvars.example

This file was deleted.