From 15eae91b611d544d756bd9b35bf25d1c0adbc984 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 15 Mar 2014 16:43:35 +0000 Subject: [PATCH] Add el7b jenkins builder, clean up image names, etc --- inventory/host_vars/209.132.184.137 | 10 ++++++++++ inventory/inventory | 2 ++ playbooks/ssh_host_keys.yml | 16 ++++++++++++++++ vars/global.yml | 9 ++++++--- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 inventory/host_vars/209.132.184.137 create mode 100644 playbooks/ssh_host_keys.yml diff --git a/inventory/host_vars/209.132.184.137 b/inventory/host_vars/209.132.184.137 new file mode 100644 index 0000000000..a9ba8e5004 --- /dev/null +++ b/inventory/host_vars/209.132.184.137 @@ -0,0 +1,10 @@ +--- +instance_type: m1.xlarge +image: "{{ el7b_qcow_id: }}" +keypair: fedora-admin-20130801 +security_group: jenkins +zone: nova +hostbase: jenkins-el7b +public_ip: 209.132.184.137 +root_auth_users: pingou +description: jenkins el7b worker/slave diff --git a/inventory/inventory b/inventory/inventory index 4de362e29f..512a708c20 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -466,6 +466,8 @@ bodhi.dev.fedoraproject.org 209.132.184.158 # F20 builder 209.132.184.209 +# RHEL7beta builder +209.132.184.137 [jenkins-cloud] 209.132.184.153 diff --git a/playbooks/ssh_host_keys.yml b/playbooks/ssh_host_keys.yml new file mode 100644 index 0000000000..44d8479c79 --- /dev/null +++ b/playbooks/ssh_host_keys.yml @@ -0,0 +1,16 @@ +- hosts: all + sudo: False + vars: + keyfile: /tmp/known_hosts + tasks: + - name: Add short name to file + local_action: shell ssh-keyscan -p {{ansible_ssh_port|default(22)}} -H {{inventory_hostname}} 2> /dev/null >> {{keyfile}} + ignore_errors: True + + - name: Add FQDN to file + local_action: shell ssh-keyscan -p {{ansible_ssh_port|default(22)}} -H {{ansible_fqdn}} 2> /dev/null >> {{keyfile}} + ignore_errors: True + + - name: Add IPv4 to file + local_action: shell ssh-keyscan -p {{ansible_ssh_port|default(22)}} -H {{ansible_default_ipv4.address}} 2> /dev/null >> {{keyfile}} + ignore_errors: True diff --git a/vars/global.yml b/vars/global.yml index a71883777f..f98f59b5c2 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -14,10 +14,13 @@ el6_qcow_id: ami-00000013 f18_qcow_id: ami-00000016 el6_ami_id: ami-0000000e f17_qcow_id: ami-00000001 -# Fedora-19-RC2-x86_64 +# Fedora-19 f19_qcow_id: ami-00000020 -# Fedora-20-TC4-x86_64 -f20_qcow_id: ami-00000038 +# Fedora-20 +f20_qcow_id: ami-00000042 +# RHEL7beta +el7b_qcow_id: ami-0000003f + # Set a default hostname base to transient. Override in host vars or command line. hostbase: transient # root_auth_users for cloud instances is '' by default