From 136810fe96573c2b494f99b2756e1f1493d21c03 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 1 Jan 2014 22:22:38 +0000 Subject: [PATCH] Fix up all the group vars to use new variable syntaax --- inventory/group_vars/all | 10 +++++----- inventory/group_vars/arm-packager | 2 +- inventory/group_vars/arm-qa | 2 +- inventory/group_vars/arm-releng | 2 +- inventory/group_vars/buildvm | 14 +++++++------- inventory/group_vars/kernel-qa | 9 +++------ inventory/group_vars/keys | 12 ++++++------ inventory/group_vars/mailman-stg | 12 ++++++------ inventory/group_vars/releng | 10 +++++----- inventory/group_vars/sign | 2 +- inventory/group_vars/taskbot | 12 ++++++------ playbooks/groups/arm-qa.yml | 2 +- 12 files changed, 43 insertions(+), 46 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 6a8ea2f92b..288cc34a1b 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -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 diff --git a/inventory/group_vars/arm-packager b/inventory/group_vars/arm-packager index 18c1b95427..63225d784b 100644 --- a/inventory/group_vars/arm-packager +++ b/inventory/group_vars/arm-packager @@ -1,4 +1,4 @@ --- fas_client_groups: packager freezes: false -sudoers: $private/files/sudo/arm-packager +sudoers: "{{ private }}/files/sudo/arm-packager" diff --git a/inventory/group_vars/arm-qa b/inventory/group_vars/arm-qa index cc502d11f4..41b84c970d 100644 --- a/inventory/group_vars/arm-qa +++ b/inventory/group_vars/arm-qa @@ -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 diff --git a/inventory/group_vars/arm-releng b/inventory/group_vars/arm-releng index 99927a970a..758e7d70d3 100644 --- a/inventory/group_vars/arm-releng +++ b/inventory/group_vars/arm-releng @@ -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" diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm index 6a88305cfd..251322ba18 100644 --- a/inventory/group_vars/buildvm +++ b/inventory/group_vars/buildvm @@ -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 diff --git a/inventory/group_vars/kernel-qa b/inventory/group_vars/kernel-qa index e7ace7a81a..8e03331925 100644 --- a/inventory/group_vars/kernel-qa +++ b/inventory/group_vars/kernel-qa @@ -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" diff --git a/inventory/group_vars/keys b/inventory/group_vars/keys index 081a1f27ce..574a010540 100644 --- a/inventory/group_vars/keys +++ b/inventory/group_vars/keys @@ -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 diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman-stg index 121acacb35..51b55f1011 100644 --- a/inventory/group_vars/mailman-stg +++ b/inventory/group_vars/mailman-stg @@ -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 diff --git a/inventory/group_vars/releng b/inventory/group_vars/releng index fcb291689d..863d42de54 100644 --- a/inventory/group_vars/releng +++ b/inventory/group_vars/releng @@ -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 diff --git a/inventory/group_vars/sign b/inventory/group_vars/sign index d962812ae6..9651180d5a 100644 --- a/inventory/group_vars/sign +++ b/inventory/group_vars/sign @@ -1,4 +1,4 @@ --- freezes: true postfix_group: sign -iptables: $files/iptables/iptables.sign +iptables: "{{ files }}/iptables/iptables.sign" diff --git a/inventory/group_vars/taskbot b/inventory/group_vars/taskbot index a969deb800..fa60108d50 100644 --- a/inventory/group_vars/taskbot +++ b/inventory/group_vars/taskbot @@ -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 diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index f1fd7cd7f8..80bcebe3ce 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -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