Update playbooks for automatic deployment tests

kubean-io · Feb 13, 2016 · 323ff78 · 323ff78
1 parent ad18f22
commit 323ff78
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/tests/cloud_playbooks/create-aws.yml b/tests/cloud_playbooks/create-aws.yml
@@ -20,7 +20,7 @@
 
   - name: Template the inventory
     template:
-      src: templates/inventory.ini.j2
+      src: ../templates/inventory-aws.j2
       dest: "{{ inventory_path }}"
 
   - name: Wait until SSH is available

diff --git a/tests/cloud_playbooks/delete-aws.yml b/tests/cloud_playbooks/delete-aws.yml
@@ -9,6 +9,8 @@
   - name: Terminate EC2 instances
     local_action:
       module: ec2
+      aws_access_key: "{{ aws_access_key }}"
+      aws_secret_key: "{{ aws_secret_key }}"
       state: absent
       instance_ids: "{{ ansible_ec2_instance_id }}"
       region: "{{ ansible_ec2_placement_region }}"

diff --git a/tests/local_inventory/hosts.cfg b/tests/local_inventory/hosts.cfg
@@ -1 +1 @@
-localhost ansible_connection=localx
+localhost ansible_connection=local
diff --git a/tests/templates/inventory.ini.j2 → tests/templates/inventory-aws.j2 b/tests/templates/inventory.ini.j2 → tests/templates/inventory-aws.j2
@@ -1,6 +1,6 @@
-node1 ansible_ssh_host={{ec2.instances[0].public_ip}} ansible_ssh_user=admin
-node2 ansible_ssh_host={{ec2.instances[1].public_ip}} ansible_ssh_user=admin
-node3 ansible_ssh_host={{ec2.instances[2].public_ip}} ansible_ssh_user=admin
+node1 ansible_ssh_host={{ec2.instances[0].public_ip}} ansible_ssh_user={{ssh_user}}
+node2 ansible_ssh_host={{ec2.instances[1].public_ip}} ansible_ssh_user={{ssh_user}}
+node3 ansible_ssh_host={{ec2.instances[2].public_ip}} ansible_ssh_user={{ssh_user}}
 
 [kube-master]
 node1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		localhost ansible_connection=localx
		localhost ansible_connection=local