From d4a11404fda5f8383a5837e4719c3756879e7e9b Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Wed, 26 Aug 2020 21:38:18 +0300 Subject: [PATCH] Lint fixes --- Makefile | 2 +- group_vars/all.yml | 3 +++ group_vars/centos7.yml | 3 ++- group_vars/centos8.yml | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 235c2fa..3db2dde 100644 --- a/Makefile +++ b/Makefile @@ -6,5 +6,5 @@ all: syntax yaml syntax: ansible-playbook site.yml --syntax-check -vv -yaml: +yamllint: find . -name \*.yml -exec yamllint {} \; diff --git a/group_vars/all.yml b/group_vars/all.yml index bd84047..b8e7a1e 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -30,5 +30,8 @@ tls_certs: /etc/pki/tls/certs tls_private: /etc/pki/tls/private tls_bundle: /etc/pki/tls/cert.pem +# url where installer data is located +boot_url: http://boot.foo.sh/ks + # hardcode this for now ansible_datacenter: home diff --git a/group_vars/centos7.yml b/group_vars/centos7.yml index 5fdd45a..e830e68 100644 --- a/group_vars/centos7.yml +++ b/group_vars/centos7.yml @@ -5,6 +5,7 @@ mem_size: 1536 num_cpus: 1 # extra args for virt-install +ks_file: "{{ boot_url }}/centos7.ks" virt_install_os_args: > - --extra-args "ks=http://boot.foo.sh/ks/centos7.ks console=ttyS0 net.ifnames=0 ksdevice=eth0" + --extra-args "ks={{ ks_file }} console=ttyS0 net.ifnames=0 ksdevice=eth0" --location http://centos.mirror.gnu.fi/7/os/x86_64 diff --git a/group_vars/centos8.yml b/group_vars/centos8.yml index 4da2d9c..7eaa37c 100644 --- a/group_vars/centos8.yml +++ b/group_vars/centos8.yml @@ -5,6 +5,7 @@ mem_size: 2048 num_cpus: 1 # extra args for virt-install +ks_file: "{{ boot_url }}/centos8.ks" virt_install_os_args: > - --extra-args "ks=http://boot.foo.sh/ks/centos8.ks console=ttyS0 net.ifnames=0 ksdevice=eth0" + --extra-args "ks={{ ks_file }} console=ttyS0 net.ifnames=0 ksdevice=eth0" --location https://nic.funet.fi/pub/mirrors/centos.org/8/BaseOS/x86_64/os