Skip to content

Commit

Permalink
Merge pull request hashicorp#207 from hashicorp/f-aws-nodejs-app
Browse files Browse the repository at this point in the history
AWS: remove nodejs dependency on Atlas Applications
  • Loading branch information
rcgenova authored Sep 21, 2016
2 parents 5b72cb6 + e449a8b commit 44077bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 22 deletions.
6 changes: 3 additions & 3 deletions packer/aws/ubuntu/nodejs.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"ssh_username": "ubuntu",
"scripts_dir": "scripts/ubuntu",
"config_dir": "config",
"host_app_dir": "/application",
"slug_app_dir": "app/"
"host_app_dir": "/application"
},
"push": {
"name": "{{user `atlas_username`}}/{{user `name`}}",
"base_dir": "../../.",
"include": [
"{{user `scripts_dir`}}/*",
"{{user `scripts_dir`}}/upstart/*",
"{{user `scripts_dir`}}/nodejs_app/*",
"{{user `config_dir`}}/*",
"{{user `config_dir`}}/consul/*",
"{{user `config_dir`}}/consul_template/*",
Expand Down Expand Up @@ -79,7 +79,7 @@
},
{
"type": "file",
"source": "{{user `slug_app_dir`}}",
"source": "{{user `scripts_dir`}}/nodejs_app/",
"destination": "{{user `host_app_dir`}}"
},
{
Expand Down
19 changes: 0 additions & 19 deletions terraform/providers/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,25 +156,6 @@ We built artifacts for the `us-east-1` region in this walkthrough. If you'd like

If you decide to update any of the artifact names, be sure those name changes are reflected in your `terraform.tfvars` file(s).

### Deploy a `us-east-1` Node.js Application

- [ ] Fork the [`demo-app-nodejs` repo](https://github.com/hashicorp/demo-app-nodejs)
- [ ] Use the [New Application](https://atlas.hashicorp.com/applications/new) tool to create your Node.js Application
- [ ] **Choose a name for the application**: `aws-us-east-1-nodejs`
- [ ] **Compile Application**: checked
- [ ] **Build Template**: `aws-us-east-1-ubuntu-nodejs`
- [ ] **Connect application to a GitHub repository**
- [ ] **GitHub repository**: `demo-app-nodejs`
- [ ] Leave both **Application directory** and **Application Template** blank

Upload new versions of the application by merging a commit into master from your forked repo. This will upload your latest app code and trigger a Packer build to create a new compiled application artifact.

If you don't have a change to make, you can force an application ingress into Atlas with an empty commit.

$ git commit --allow-empty -m "Force a change in Atlas"

If you want to create artifacts in other regions, complete these same steps but select a Build Template from the region you'd like.

### Provision the `aws-global` Environment

- [ ] Use the [Import Terraform Configuration from GitHub](https://atlas.hashicorp.com/configurations/import) tool to import the `aws-global` Environment from GitHub
Expand Down

0 comments on commit 44077bc

Please sign in to comment.