Removed ansible refs, which are now in Ansible Galaxy. Promoted vagrant

portworx · May 1, 2018 · 5518fed · 5518fed
1 parent a873454
commit 5518fed
Show file tree

Hide file tree

Showing 22 changed files with 82 additions and 334 deletions.
diff --git a/automation/ansible/deprecated/all-in-one/README.md b/automation/ansible/deprecated/all-in-one/README.md
diff --git a/automation/ansible/deprecated/all-in-one/inv b/automation/ansible/deprecated/all-in-one/inv
diff --git a/automation/ansible/deprecated/all-in-one/play.yml b/automation/ansible/deprecated/all-in-one/play.yml
diff --git a/automation/ansible/deprecated/all-in-one/templates/etcd3.service.js b/automation/ansible/deprecated/all-in-one/templates/etcd3.service.js
diff --git a/automation/ansible/deprecated/all-in-one/templates/lh-compose.js b/automation/ansible/deprecated/all-in-one/templates/lh-compose.js
diff --git a/automation/ansible/deprecated/all-in-one/templates/px.service.js b/automation/ansible/deprecated/all-in-one/templates/px.service.js
diff --git a/automation/ansible/portworx/README.md b/automation/ansible/portworx/README.md
diff --git a/automation/ansible/portworx/inv.yml b/automation/ansible/portworx/inv.yml
diff --git a/automation/ansible/portworx/portworx.yml b/automation/ansible/portworx/portworx.yml
diff --git a/automation/vagrant/.gitignore b/automation/vagrant/.gitignore
diff --git a/aws/asg/instance.tf b/aws/asg/instance.tf
@@ -25,7 +25,7 @@ sudo apt-add-repository ppa:ansible/ansible
 sudo apt-get -y update
 sudo apt-get -y install ansible
 sudo "curl -fsL http://get.docker.com | sh"
-sudo "curl -fsL http://get.portworx.com | sh"
+# sudo "curl -fsL http://get.portworx.com | sh"
 EOF
 
 }

diff --git a/aws/asg/variables.tf b/aws/asg/variables.tf
@@ -1,17 +1,20 @@
 variable "namespace" { 
+  default = "jeff"
 }
 
 variable "volsize" {
    description = "Extra EBS volsize"
+   default = 100
 }
 
 variable "instances" {
   description = "The number of servers."
+  default = 1
 }
 
 # AWS Specific variables
 variable "instance_type" {
-  default = "t2.medium"
+  default = "t2.small"
 }
 
 variable "pub_key" {
@@ -20,6 +23,7 @@ variable "pub_key" {
 
 variable "key_name" {
   description = "The id of the ssh key to add to the servers"
+  default = "jeff"
 }
 
 variable "vpc_cidr_block" {

diff --git a/digital_ocean/centos/vars.tf b/digital_ocean/centos/vars.tf
@@ -1,6 +1,6 @@
 variable "do_token" {
   description = "API Token"
-  default = ""
+  default = "9aa81648927045158b7d2b2d538690adeffbf18e4b531cef21341ee006dd7a7c"
 }
 
 variable "do_count" {
@@ -15,7 +15,7 @@ variable "region" {
 
 variable "size" {
    description = "Instance size: [ 2gb, 4gb, 8gb, 16gb, 32gb, 48gb, 64gb ]"
-   default = ""
+   default = "4gb"
 }
 
 variable "volsize" {
@@ -40,7 +40,7 @@ variable "pub_key" {
 
 variable "ssh_fingerprint" {
   description = "fingerprint"
-  default = ""
+  default = "74:aa:a7:6e:2a:78:fb:27:d5:01:5e:94:1a:d3:38:fd"
 }
 
 
diff --git a/digital_ocean/coreos/outputs.tf b/digital_ocean/coreos/outputs.tf
@@ -1,3 +1,4 @@
 output "ip-addrs" {
    value = [ "${formatlist("ssh core@%s", "${digitalocean_droplet.coreos.*.ipv4_address}")}" ]
 }
+