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

Fix up all the group vars to use new variable syntaax

Browse source
This commit is contained in:
Kevin Fenzi 2014-01-01 22:22:38 +00:00
parent a356dd16eb
commit 136810fe96
12 changed files with 43 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/group_vars/all
View file

@ -28,11 +28,11 @@ lvm_size: 20000
# default virt install command is for a single nic-device
# define in another group file for more nics (see buildvm)
virt_install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size}
--disk ${volgroup}/${inventory_hostname}
--vcpus=${num_cpus} -l ${ks_repo} -x
"ksdevice=eth0 ks=${ks_url} ip=${eth0_ip} netmask=${nm}
gateway=${gw} dns=${dns} console=tty0 console=ttyS0
hostname=${inventory_hostname}"
--disk {{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
"ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }}"
--network=bridge=br0 --autostart --noautoconsole

2
inventory/group_vars/arm-packager
View file

@ -1,4 +1,4 @@
---
fas_client_groups: packager
freezes: false
sudoers: $private/files/sudo/arm-packager
sudoers: "{{ private }}/files/sudo/arm-packager"

2
inventory/group_vars/arm-qa
View file

@ -1,5 +1,5 @@
---
fas_client_groups: sysadmin-qa,arm-qa
freezes: false
sudoers: $private/files/sudo/arm-qa-sudoers
sudoers: "{{ private }}/files/sudo/arm-qa-sudoers"
libdir: /usr/lib

2
inventory/group_vars/arm-releng
View file

@ -5,4 +5,4 @@ freezes: false
# These are 32bit
#
libdir: /usr/lib
sudoers: $private/files/sudo/arm-releng-sudoers
sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"

14
inventory/group_vars/buildvm
View file

@ -10,13 +10,13 @@ gw: 10.5.125.254
eth1_gw: 10.5.127.254
dns: 10.5.126.21
volgroup: /dev/vg_host01
virt_install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size}
--disk bus=virtio,path=${volgroup}/${inventory_hostname}
--vcpus=${num_cpus} -l ${ks_repo} -x
"ksdevice=eth0 ks=${ks_url} console=tty0 console=ttyS0
hostname=${inventory_hostname} nameserver=${dns}
ip=${eth0_ip}::${gw}:${nm}:${inventory_hostname}:eth0:none
ip=${eth1_ip}:::${nm}:${inventory_hostname}-nfs:eth1:none"
virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
"ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }} nameserver={{ dns }}
ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none"
--network=bridge=br0,model=virtio --network=bridge=br1,model=virtio
--autostart --noautoconsole

9
inventory/group_vars/kernel-qa
View file

@ -1,9 +1,6 @@
---
freezes: true
resolvconf: $files/resolv.conf/phx2
rsyslogconf: $files/rsyslog/rsyslog.conf.phx2
resolvconf: "{{ files }}/resolv.conf/phx2"
rsyslogconf: "{{ files }}/rsyslog/rsyslog.conf.phx2"
fas_client_groups: sysadmin-kernel
sudoers: $private/files/sudo/kernel-qa
sudoers: "{{ private }}/files/sudo/kernel-qa"

12
inventory/group_vars/keys
View file

@ -11,10 +11,10 @@ fas_client_groups: sysadmin-noc,sysadmin-keys
# default virt install command is for a single nic-device
# define in another group file for more nics (see buildvm)
virt_install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size}
--disk bus=virtio,path=${volgroup}/${inventory_hostname}
--vcpus=${num_cpus} -l ${ks_repo} -x
"ksdevice=eth0 ks=${ks_url} ip=${eth0_ip} netmask=${nm}
gateway=${gw} dns=${dns} console=tty0 console=ttyS0
hostname=${inventory_hostname}"
virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
"ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }}"
--network=bridge=br0 --autostart --noautoconsole

12
inventory/group_vars/mailman-stg
View file

@ -20,10 +20,10 @@ fedmsg_certs:
# default virt install command is for a single nic-device
# define in another group file for more nics (see buildvm)
virt_install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size}
--disk bus=virtio,path=${volgroup}/${inventory_hostname}
--vcpus=${num_cpus} -l ${ks_repo} -x
"ksdevice=eth0 ks=${ks_url} ip=${eth0_ip} netmask=${nm}
gateway=${gw} dns=${dns} console=tty0 console=ttyS0
hostname=${inventory_hostname}"
virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
"ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }}"
--network=bridge=br0 --autostart --noautoconsole

10
inventory/group_vars/releng
View file

@ -9,11 +9,11 @@ nm: 255.255.255.0
gw: 10.5.125.254
dns: 10.5.126.21
volgroup: /dev/vg_host01
virt_install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size}
--disk ${volgroup}/${inventory_hostname}
--vcpus=${num_cpus} -l ${ks_repo} -x
"ksdevice=eth0 ks=${ks_url} ip=${eth0_ip} netmask=${nm}
gateway=${gw} dns=${dns} console=tty0 console=ttyS0"
virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
--disk {{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {{ ks_repo }} -x
"ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0"
--network=bridge=br0 --network=bridge=br1 --graphics none
--autostart --noautoconsole

2
inventory/group_vars/sign
View file

@ -1,4 +1,4 @@
---
freezes: true
postfix_group: sign
iptables: $files/iptables/iptables.sign
iptables: "{{ files }}/iptables/iptables.sign"

12
inventory/group_vars/taskbot
View file

@ -11,10 +11,10 @@ fas_client_groups: sysadmin-qa
nrpe_procs_warn: 250
nrpe_procs_crit: 300
virt_install_command: /usr/sbin/virt-install -n ${inventory_hostname} -r ${mem_size}
--disk bus=virtio,path=${volgroup}/${inventory_hostname}
--vcpus=${num_cpus} -l ${ks_repo} -x
"ksdevice=eth0 ks=${ks_url} console=tty0 console=ttyS0
hostname=${inventory_hostname} nameserver=${dns}
ip=${eth0_ip}::${gw}:${nm}:${inventory_hostname}:eth0:none"
virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
--disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
--vcpus={{ num_cpus }} -l {ks_repo }} -x
"ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
hostname={{ inventory_hostname }} nameserver={{ dns }}
ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none"
--network=bridge=br0,model=virtio --autostart --noautoconsole

2
playbooks/groups/arm-qa.yml
View file

@ -9,7 +9,7 @@
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- "{{ private }}/vars.yml"
- "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
- vars/{{ ansible_distribution }}.yml
roles:
- /srv/web/infra/ansible/roles/base