diff --git a/files/copr/provision/builderpb.yml b/files/copr/provision/builderpb.yml index 357053f670..3a9df9a131 100644 --- a/files/copr/provision/builderpb.yml +++ b/files/copr/provision/builderpb.yml @@ -6,7 +6,7 @@ vars: - keypair: buildsys - - image: emi-B8793915 + - image: emi-68D638BF - instance_type: m1.large - security_group: builder diff --git a/inventory/host_vars/209.132.184.100 b/inventory/host_vars/209.132.184.100 index 566f66d410..185f9d4711 100644 --- a/inventory/host_vars/209.132.184.100 +++ b/inventory/host_vars/209.132.184.100 @@ -1,6 +1,6 @@ --- instance_type: m1.xlarge -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: webserver zone: fedoracloud diff --git a/inventory/host_vars/209.132.184.111 b/inventory/host_vars/209.132.184.111 index baf8c6d268..305cfdff24 100644 --- a/inventory/host_vars/209.132.184.111 +++ b/inventory/host_vars/209.132.184.111 @@ -1,6 +1,6 @@ --- instance_type: m1.small -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: twistedbot zone: fedoracloud diff --git a/inventory/host_vars/209.132.184.114 b/inventory/host_vars/209.132.184.114 index 392c7a3703..2af92c669e 100644 --- a/inventory/host_vars/209.132.184.114 +++ b/inventory/host_vars/209.132.184.114 @@ -1,6 +1,6 @@ --- instance_type: m1.large -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: webserver zone: fedoracloud diff --git a/inventory/host_vars/209.132.184.115 b/inventory/host_vars/209.132.184.115 index ae60e216d6..396cbaa63e 100644 --- a/inventory/host_vars/209.132.184.115 +++ b/inventory/host_vars/209.132.184.115 @@ -1,6 +1,6 @@ --- instance_type: m1.small -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: webserver zone: fedoracloud diff --git a/inventory/host_vars/209.132.184.116 b/inventory/host_vars/209.132.184.116 index 77c66dcb1f..9c86a5f550 100644 --- a/inventory/host_vars/209.132.184.116 +++ b/inventory/host_vars/209.132.184.116 @@ -1,6 +1,6 @@ --- instance_type: m1.small -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: webserver zone: fedoracloud diff --git a/inventory/host_vars/209.132.184.118 b/inventory/host_vars/209.132.184.118 index 1f24808777..7b9bc9d2f3 100644 --- a/inventory/host_vars/209.132.184.118 +++ b/inventory/host_vars/209.132.184.118 @@ -1,6 +1,6 @@ --- instance_type: m1.large -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: jenkins zone: fedoracloud diff --git a/inventory/host_vars/209.132.184.120 b/inventory/host_vars/209.132.184.120 index a66a7038a8..2cc76ef1ad 100644 --- a/inventory/host_vars/209.132.184.120 +++ b/inventory/host_vars/209.132.184.120 @@ -1,6 +1,6 @@ --- instance_type: c1.xlarge -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: logstash zone: fedoracloud diff --git a/inventory/host_vars/jenkins.cloud.fedoraproject.org b/inventory/host_vars/jenkins.cloud.fedoraproject.org index 34c2da37e5..0b3f4c6e52 100644 --- a/inventory/host_vars/jenkins.cloud.fedoraproject.org +++ b/inventory/host_vars/jenkins.cloud.fedoraproject.org @@ -1,6 +1,6 @@ --- instance_type: m1.small -image: emi-B8793915 +image: emi-68D638BF keypair: admin security_group: jenkins zone: fedoracloud diff --git a/playbooks/groups/twistedbots.yml b/playbooks/groups/twistedbots.yml index d4f2900743..685a729dfa 100644 --- a/playbooks/groups/twistedbots.yml +++ b/playbooks/groups/twistedbots.yml @@ -8,7 +8,7 @@ - ${private}/vars.yml tasks: - - include: $tasks/persistent_cloud.yml + - include: $tasks/persistent_cloud_nodisks.yml - name: provision instance hosts: twistedbots diff --git a/tasks/persistent_cloud.yml b/tasks/persistent_cloud.yml index 2a8080bece..5bdb0ec062 100644 --- a/tasks/persistent_cloud.yml +++ b/tasks/persistent_cloud.yml @@ -22,4 +22,3 @@ local_action: shell euca-attach-volume -i ${inst_res.instances[0].id} $item only_if: "'${host_is_up.rc}' != '0' and len('$item') != 0" with_items: $volumes - diff --git a/tasks/persistent_cloud_nodisks.yml b/tasks/persistent_cloud_nodisks.yml new file mode 100644 index 0000000000..1ee6740efd --- /dev/null +++ b/tasks/persistent_cloud_nodisks.yml @@ -0,0 +1,19 @@ +--- +- name: check it out + local_action: shell nc -d -z -w 5 ${inventory_hostname} 22 >>/dev/null + register: host_is_up + ignore_errors: true + +- name: spin it up + local_action: ec2_create keypair=${keypair} image=${image} type=${instance_type} wait=true group=${security_group} + register: inst_res + only_if: "'${host_is_up.rc}' != '0'" + +- name: assign it a special ip + local_action: shell euca-associate-address -i ${inst_res.instances[0].id} ${public_ip} + only_if: "'${host_is_up.rc}' != '0'" + +- name: wait for the reassignation + local_action: wait_for host=${public_ip} port=22 delay=20 timeout=300 + only_if: "'${host_is_up.rc}' != '0'" +