Skip to content

Minor fixes #2

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Minor fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f81cdb
Fix "public_ips" output in "host.tf"
mgood Aug 7, 2015
9809b05
Fix getting Terraform output vars in Gun
mgood Aug 7, 2015
dc65d00
Fix "bake" command
mgood Sep 15, 2015
c6cebe0
Add "taint" subcommand for marking Terraform resources
mgood Sep 15, 2015
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
2 changes: 1 addition & 1 deletion infra/host/host.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ resource "aws_instance" "host" {
}

output "public_ips" {
value = "${join(\",\", aws_instance.node.*.public_ip)}"
value = "${join(\",\", aws_instance.host.*.public_ip)}"
}

output "name" {
Expand Down
17 changes: 15 additions & 2 deletions module/cell.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ init() {
cmd-export cell-plan plan
cmd-export cell-destroy destroy
cmd-export cell-output output
cmd-export cell-taint taint
cmd-export cell-bake bake
}

Expand All @@ -28,7 +29,8 @@ coreos-ami() {

user-ami() {
declare region="$1" name="$2"
aws ec2 --region "$region" \
aws --output json \
ec2 --region "$region" \
describe-images \
--owners self \
--filters "Name=name,Values=$name" \
Expand All @@ -38,7 +40,7 @@ user-ami() {
cell-rundir() {
if [[ ! "$cell_rundir" ]]; then
mkdir -p "$GUN_ROOT/.gun/runs"
cell_rundir="$(ls -1Ut $GUN_ROOT/.gun/runs/ | grep "$GUN_PROFILE-" | head -n 1)"
cell_rundir="$GUN_ROOT/.gun/runs/$(ls -1Ut $GUN_ROOT/.gun/runs/ | grep "$GUN_PROFILE-" | head -n 1)"
fi
echo "${cell_rundir:?}"
}
Expand Down Expand Up @@ -89,6 +91,17 @@ cell-output() {
popd > /dev/null
}

cell-taint() {
declare name="$1" target="$2"
if [[ ! "$target" ]]; then
target=".cell"
fi
pushd "$(cell-rundir)/$target" > /dev/null
# XXX include additional options
terraform taint $name
popd > /dev/null
}

#cell-init() {
# local stack_dir="$(dirname $BASH_SOURCE)/stack"
# cp -r $stack_dir/* .
Expand Down