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

Fix a bunch of duplicate variables.

Browse source
This commit is contained in:
Kevin Fenzi 2015-11-11 22:09:23 +00:00
parent 5b5d8236ba
commit 78b301cb30
6 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/koji
View file

@ -50,5 +50,3 @@ virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none" ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none"
--network=bridge=br0,model=virtio --network=bridge=br1,model=virtio --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio
--autostart --noautoconsole --autostart --noautoconsole
sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"

1
inventory/host_vars/autocloud-backend-vbox.phx2.fedoraproject.org
View file

@ -10,7 +10,6 @@ nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
# general configs # general configs
nrpe_procs_warn: 900 nrpe_procs_warn: 900
nrpe_procs_crit: 1000 nrpe_procs_crit: 1000
datacenter: phx2
nm: 255.255.255.0 nm: 255.255.255.0
gw: 10.5.126.254 gw: 10.5.126.254
dns: 10.5.126.21 dns: 10.5.126.21

4
inventory/host_vars/jenkins.fedorainfracloud.org
View file

@ -4,7 +4,7 @@ instance_type: m1.small
keypair: fedora-admin-20130801 keypair: fedora-admin-20130801
security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,all-icmp-persistent security_group: ssh-anywhere-persistent,web-80-anywhere-persistent,default,all-icmp-persistent
zone: nova zone: nova
tcp_ports: [22, 80, 443] tcp_ports: [22, 80, 443, 8080]
inventory_tenant: persistent inventory_tenant: persistent
inventory_instance_name: jenkins inventory_instance_name: jenkins
@ -21,8 +21,6 @@ cloud_networks:
# persistent-net # persistent-net
- net-id: "67b77354-39a4-43de-b007-bb813ac5c35f" - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
tcp_ports: [ 8080 ]
custom_nat_rules: [ custom_nat_rules: [
# Redirect port 80 to 8080, which is used by jenkins # Redirect port 80 to 8080, which is used by jenkins
'-A PREROUTING -i eth0 -p tcp --dport 80 -j REDIRECT --to-port 8080', '-A PREROUTING -i eth0 -p tcp --dport 80 -j REDIRECT --to-port 8080',

1
inventory/host_vars/people01.fedoraproject.org
View file

@ -1,6 +1,5 @@
--- ---
freezes: false freezes: false
datacenter: ibiblio
#host_backup_targets: ['/srv/web'] #host_backup_targets: ['/srv/web']
nm: 255.255.255.128 nm: 255.255.255.128

2
inventory/host_vars/proxy07.fedoraproject.org
View file

@ -8,8 +8,6 @@ eth0_ip: 213.175.193.206
vmhost: bodhost01.fedoraproject.org vmhost: bodhost01.fedoraproject.org
datacenter: bodhost datacenter: bodhost
postfix_group: vpn
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/

4
inventory/host_vars/testdays.fedorainfracloud.org
View file

@ -46,7 +46,6 @@ resultsdb_db_host_machine: "{{ public_ip }}"
resultsdb_db_host: 127.0.0.1 resultsdb_db_host: 127.0.0.1
resultsdb_db_port: 5432 resultsdb_db_port: 5432
resultsdb_endpoint: 'resultsdb_api' resultsdb_endpoint: 'resultsdb_api'
resultsdb_fe_endpoint: 'resultsdb'
resultsdb_db_name: resultsdb_testdays resultsdb_db_name: resultsdb_testdays
resultsdb_db_user: "{{ testdays_testdays_db_user }}" resultsdb_db_user: "{{ testdays_testdays_db_user }}"
@ -56,9 +55,6 @@ resultsdb_secret_key: "{{ testdays_resultsdb_secretkey }}"
allowed_hosts: allowed_hosts:
- 127.0.0.1 - 127.0.0.1
resultsdb_endpoint: "resultsdb-api"
############################################################ ############################################################
# resultsdb_frontend # resultsdb_frontend
############################################################ ############################################################