Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2016-04-21 22:04:12 +00:00
commit 302aea96bc
11 changed files with 55 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/host_vars/arm01-builder22.arm.fedoraproject.org
View file

@ -3,3 +3,5 @@ koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"
koji_weburl: "http://koji.stg.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.stg.fedoraproject.org/"
datacenter: staging
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
koji_hub_nfs: "fedora_koji"

2
inventory/host_vars/arm01-builder23.arm.fedoraproject.org
View file

@ -3,3 +3,5 @@ koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"
koji_weburl: "http://koji.stg.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.stg.fedoraproject.org/"
datacenter: staging
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
koji_hub_nfs: "fedora_koji"

19
inventory/host_vars/jenkins-slave-f23.fedorainfracloud.org Normal file
View file

@ -0,0 +1,19 @@
---
image: "{{ fedora23_x86_64 }}"
instance_type: m1.xlarge
keypair: fedora-admin-20130801
security_group: ssh-anywhere-persistent,all-icmp-persistent,default
zone: nova
tcp_ports: [22]
inventory_tenant: persistent
inventory_instance_name: jenkins-slave-f23
hostbase: jenkins-slave-f23
public_ip: 209.132.184.47
root_auth_users: mizdebsk msrb
description: jenkins f23 builder in new cloud
cloud_networks:
# persistent-net
- net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"

19
inventory/host_vars/jenkins-slave-f24.fedorainfracloud.org Normal file
View file

@ -0,0 +1,19 @@
---
image: "{{ fedora24_alpha_x86_64 }}"
instance_type: m1.xlarge
keypair: fedora-admin-20130801
security_group: ssh-anywhere-persistent,all-icmp-persistent,default
zone: nova
tcp_ports: [22]
inventory_tenant: persistent
inventory_instance_name: jenkins-slave-f24
hostbase: jenkins-slave-f24
public_ip: 209.132.184.237
root_auth_users: mizdebsk msrb
description: jenkins f24 builder in new cloud
cloud_networks:
# persistent-net
- net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"

2
inventory/inventory
View file

@ -1041,6 +1041,8 @@ jenkins.fedorainfracloud.org
jenkins-slave-el6.fedorainfracloud.org
jenkins-slave-el7.fedorainfracloud.org
jenkins-slave-f22.fedorainfracloud.org
jenkins-slave-f23.fedorainfracloud.org
jenkins-slave-f24.fedorainfracloud.org
[osuosl]
proxy06.fedoraproject.org

3
playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
View file

@ -641,7 +641,8 @@
copy_from: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2
- name: CentOS-6-x86_64-GenericCloud-20141129_01
copy_from: http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud-20141129_01.qcow2
- name: Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2
copy_from: http://dl.fedoraproject.org/pub/fedora/linux/releases/test/24_Alpha/CloudImages/x86_64/images/Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2
# RHEL6 can be downloaded from https://rhn.redhat.com/rhn/software/channel/downloads/Download.do?cid=16952
- stat: path=/root/images/rhel-guest-image-6.6-20141222.0.x86_64.qcow2
register: rhel6_image

3
roles/iscsi_client/files/multipath.conf
View file

@ -28,6 +28,9 @@ blacklist {
device {
vendor "DELL"
}
device {
vendor "WD"
}
wwid "*GBRL0015XVEUCM*" # Blacklist the on board blade RAID controller
}

6
roles/nfs/client/tasks/main.yml
View file

@ -111,7 +111,7 @@
- name: nfs mount points (stg) staging koji
mount: >
name=/mnt/fedora_koji
src=10.5.126.87:/mnt/{{ nfs_src_dir }}
src=10.5.126.87:/mnt/fedora_koji
fstype=nfs4
opts={{nfs_mount_opts}}
passno=0
@ -123,8 +123,8 @@
- name: nfs mount points (stg) production koji ro
mount: >
name={{ mnt_dir }}
src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/{{ nfs_src_dir }}
name=/mnt/fedora_koji_prod
src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/fedora_koji
fstype=nfs
opts=ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3
passno=0

2
roles/nfs/server/files/koji01.stg.phx2.fedoraproject.org-exports
View file

@ -1 +1 @@
/mnt/fedora_koji 10.5.126.90(rw,no_root_squash) 10.5.126.14(rw,no_root_squash) 10.5.126.6(rw,no_root_squash) 10.5.126.169(ro) 10.5.126.223(rw,no_root_squash) 10.5.126.224(rw,no_root_squash) 10.5.126.225(rw,no_root_squash) 10.5.126.226(rw,no_root_squash)
/mnt/fedora_koji 10.5.126.90(rw,no_root_squash) 10.5.126.14(rw,no_root_squash) 10.5.126.6(rw,no_root_squash) 10.5.126.169(ro) 10.5.126.223(rw,no_root_squash) 10.5.126.224(rw,no_root_squash) 10.5.126.225(rw,no_root_squash) 10.5.126.226(rw,no_root_squash) 10.5.78.32(rw,no_root_squash) 10.5.78.33(rw,no_root_squash)

2
tasks/yumrepos.yml
View file

@ -21,7 +21,7 @@
- fedora.repo
- fedora-updates.repo
- fedora-updates-testing.repo
when: ansible_distribution == 'Fedora' and (ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l') and not inventory_hostname.startswith('arm03')
when: ansible_distribution == 'Fedora' and (ansible_architecture == 'x86_64' or ansible_architecture == 'i386' or ansible_architecture == 'armv7l') and not inventory_hostname.startswith('arm03') and not inventory_hostname.startswith('jenkins-slave-f24')
tags:
- config
- packages

1
vars/global.yml
View file

@ -39,6 +39,7 @@ fedora_atomic_22_alpha: Fedora-Cloud-Atomic-22_Alpha-20150305.x86_64
fedora_atomic_22_beta: Fedora-Cloud-Atomic-22_Beta-20150415.x86_64
fedora_atomic_22: Fedora-Cloud-Atomic-22-20150521.x86_64
fedora23_x86_64: Fedora-Cloud-Base-23-20151030.x86_64
fedora24_alpha_x86_64: Fedora-Cloud-Base-24_Alpha-7.x86_64.qcow2
centos70_x86_64: CentOS-7-x86_64-GenericCloud-1503
centos66_x86_64: CentOS-6-x86_64-GenericCloud-20141129_01
rhel70_x86_64: rhel-guest-image-7.0-20140930.0.x86_64