diff --git a/group_vars/git.yml b/group_vars/git.yml index 53c504d..a4bc832 100644 --- a/group_vars/git.yml +++ b/group_vars/git.yml @@ -1,6 +1,5 @@ --- -os_type: centos7 datadisk_size: - 10 diff --git a/group_vars/mirror.yml b/group_vars/mirror.yml index 305bf2e..c365158 100644 --- a/group_vars/mirror.yml +++ b/group_vars/mirror.yml @@ -1,6 +1,5 @@ --- -os_type: centos7 datadisk_size: - 1000 diff --git a/group_vars/openbsd.yml b/group_vars/openbsd.yml new file mode 100644 index 0000000..a8bf7cd --- /dev/null +++ b/group_vars/openbsd.yml @@ -0,0 +1,15 @@ +--- +# fix python path errors +ansible_python_interpreter: "/usr/bin/env python" + +# we have real wheel group +ansible_wheel: wheel + +# fix tls directories +tls_certs: /etc/ssl +tls_private: /etc/ssl/private + +# default resources for new vm +dsk_size: 10 +mem_size: 256 +num_cpus: diff --git a/hosts b/hosts index 930af8d..6e38a08 100644 --- a/hosts +++ b/hosts @@ -3,3 +3,7 @@ mirror01.home.foo.sh [git] git02.home.foo.sh + +[centos7:children] +git +mirror diff --git a/playbooks/include/vm-create.yml b/playbooks/include/vm-create.yml index 4a72feb..af1cc39 100644 --- a/playbooks/include/vm-create.yml +++ b/playbooks/include/vm-create.yml @@ -3,9 +3,6 @@ hosts: "{{myhosts}}" gather_facts: false - vars_files: - - "../../vars/{{ os_type }}.yml" - vars: letters: "{{ 'bcdefghijklmnopqrstuvwxyz'|list }}" vmhost_uri: "qemu+ssh://root@{{ vmhost }}/system" diff --git a/vars/centos7.yml b/vars/centos7.yml deleted file mode 100644 index 5fdd45a..0000000 --- a/vars/centos7.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# default resources for new vm -dsk_size: 20 -mem_size: 1536 -num_cpus: 1 - -# extra args for virt-install -virt_install_os_args: > - --extra-args "ks=http://boot.foo.sh/ks/centos7.ks console=ttyS0 net.ifnames=0 ksdevice=eth0" - --location http://centos.mirror.gnu.fi/7/os/x86_64 diff --git a/vars/openbsd.yml b/vars/openbsd.yml deleted file mode 100644 index 6e5401c..0000000 --- a/vars/openbsd.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# default resources for new vm -dsk_size: 10 -mem_size: 256 -num_cpus: 1