diff --git a/inventory/host_vars/jenkins-el6.fedorainfracloud.org b/inventory/host_vars/jenkins-el6.fedorainfracloud.org new file mode 100644 index 0000000000..e8489d83b6 --- /dev/null +++ b/inventory/host_vars/jenkins-el6.fedorainfracloud.org @@ -0,0 +1,19 @@ +--- +image: centos66_x86_64 +instance_type: m1.small +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-persistent,all-icmp-persistent +zone: nova +tcp_ports: [22, 80] + +inventory_tenant: persistent +inventory_instance_name: jenkins-el6 +hostbase: jenkins-el6 +public_ip: 209.132.184.58 +root_auth_users: mizdebsk,msrb +description: jenkins el6 builder in new cloud + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" + diff --git a/inventory/host_vars/jenkins.fedorainfracloud.org b/inventory/host_vars/jenkins.fedorainfracloud.org new file mode 100644 index 0000000000..d2bfa8ec7d --- /dev/null +++ b/inventory/host_vars/jenkins.fedorainfracloud.org @@ -0,0 +1,19 @@ +--- +image: fedora22_x86_64 +instance_type: m1.small +keypair: fedora-admin-20130801 +security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,all-icmp-persistent +zone: nova +tcp_ports: [22, 80, 443] + +inventory_tenant: persistent +inventory_instance_name: jenkins +hostbase: jenkins +public_ip: 209.132.184.57 +root_auth_users: mizdebsk,msrp +description: jenkins master in new cloud + +cloud_networks: + # persistent-net + - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" + diff --git a/inventory/inventory b/inventory/inventory index e99b0b09cf..ca3e6f4bc2 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -837,6 +837,10 @@ grafana.cloud.fedoraproject.org [jenkins-cloud:children] jenkins-slaves +[jenkins-dev] +jenkins.fedorainfracloud.org +jenkins-el6.fedorainfracloud.org + [osuosl] proxy06.fedoraproject.org diff --git a/playbooks/groups/jenkins-dev.yml b/playbooks/groups/jenkins-dev.yml new file mode 100644 index 0000000000..f53aac0af7 --- /dev/null +++ b/playbooks/groups/jenkins-dev.yml @@ -0,0 +1,27 @@ +- name: check/create instance + hosts: jenkins-dev + gather_facts: False + + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - /srv/private/ansible/vars.yml + - /srv/web/infra/ansible/vars/fedora-cloud.yml + - /srv/private/ansible/files/openstack/passwords.yml + + tasks: + - include: "{{ tasks }}/persistent_cloud_new.yml" + - include: "{{ tasks }}/growroot_cloud.yml" + +- name: setup all the things + hosts: jenkins-dev + gather_facts: True + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - /srv/private/ansible/vars.yml + - /srv/private/ansible/files/openstack/passwords.yml + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + pre_tasks: + - include: "{{ tasks }}/cloud_setup_basic.yml" + - name: set hostname (required by some services, at least postfix need it) + shell: "hostname {{inventory_hostname}}"