From d27d00503c35644e39e2236755757f541e9eb477 Mon Sep 17 00:00:00 2001 From: hybris Date: Mon, 28 Jan 2019 15:28:15 +0100 Subject: [PATCH] Move config variables to inventory --- 1-terraform.yml | 17 ----------------- hosts.yml | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/1-terraform.yml b/1-terraform.yml index 6c16442..83c6a83 100644 --- a/1-terraform.yml +++ b/1-terraform.yml @@ -6,23 +6,6 @@ - terraform vars: - # libvirt host vars - libvirt_host: 2001:470:6d:22c:1::1 - libvirt_storage_pool: kubernetes - libvirt_network_bridge: home-lan - - # network vars - network_domain: e2m - network_default_gw: 2001:470:6d:22c::1 - network_dns: 2001:470:6d:22c::1 - - # ansible user vars - remote_user_ssh_pubkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXh0iMMtbTEhRSgIbgCunAuE+Q1iKycRVRBYWDCQ45xE8nHsg7K98fdv6LqQwkTqlojEHKp2/TPawk8V6w3MTgOHXi/WO9FyvhMjUcfdxTvny1z3Pj1j0NglKjyQ3t30snwOBYJiC2qDDtvRYNJs+Re/aSdVbygOHMf0UqCyP8DL7Tcj5sNPgnleEC7jE+YNbyDJo2KtNFXy3+AMbwa742D5Ygi5FqaBO090gVQfb3hbnZLw9CNSK7vjo7k5hJo8d1kcPDth1Vo12IDejL8Al3ArfGSy5IqYXs8Stj4YVRW+78AOpQZiInCaFybqjsGG+5tezrXHrxhjJPHuSCuXk9vxkcUk7aC5eSDqoCP7RTB+iQCPJ1ZvkVbaebExZGgHpD9t2Xo2bd/3BRagIxPTzKo9q4+qCCClhWR4iUSOr/YKAZBFDdoVWg2IMqbUHzvHX7TE7I8hbAdg6CpgwBoJm8OWmfjkDU6aYnF8z9l36VV7xjvvuYbOrhpCJ9LGFSfmG3wswo8OH4XyRSHd3y7qrSYIGujtymrzozXo2MrMU3Rj2bW5MIEZSxleIVje4PHWOfZwwn3hwvqM/nyknzfNwPCidTsP3Q2FwfBtZYo1cIXH41bzjs4Bxb8+KJqwTcerzB1pT4qsoPnoYW0fnZE7NHVNhfNx53LdctclFerHTLMw== hybris@sparks - - ## does this make sense?? - source_cloud_image_name: CentOS-7-x86_64-GenericCloud.qcow2 - source_cloud_image_url: "https://cloud.centos.org/centos/7/images/{{ source_cloud_image_name }}" - # TODO: import hosts from a specific host group of the inventory instead of listing them here again kubernetes: - hostname: k8s-master diff --git a/hosts.yml b/hosts.yml index 85a616b..d4d78a9 100644 --- a/hosts.yml +++ b/hosts.yml @@ -1,4 +1,21 @@ all: + vars: + libvirt_host: 2001:470:6d:22c:1::1 + libvirt_storage_pool: kubernetes + libvirt_network_bridge: home-lan + + # network vars + network_domain: e2m + network_default_gw: 2001:470:6d:22c::1 + network_dns: 2001:470:6d:22c::1 + + # ansible user vars + remote_user_ssh_pubkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXh0iMMtbTEhRSgIbgCunAuE+Q1iKycRVRBYWDCQ45xE8nHsg7K98fdv6LqQwkTqlojEHKp2/TPawk8V6w3MTgOHXi/WO9FyvhMjUcfdxTvny1z3Pj1j0NglKjyQ3t30snwOBYJiC2qDDtvRYNJs+Re/aSdVbygOHMf0UqCyP8DL7Tcj5sNPgnleEC7jE+YNbyDJo2KtNFXy3+AMbwa742D5Ygi5FqaBO090gVQfb3hbnZLw9CNSK7vjo7k5hJo8d1kcPDth1Vo12IDejL8Al3ArfGSy5IqYXs8Stj4YVRW+78AOpQZiInCaFybqjsGG+5tezrXHrxhjJPHuSCuXk9vxkcUk7aC5eSDqoCP7RTB+iQCPJ1ZvkVbaebExZGgHpD9t2Xo2bd/3BRagIxPTzKo9q4+qCCClhWR4iUSOr/YKAZBFDdoVWg2IMqbUHzvHX7TE7I8hbAdg6CpgwBoJm8OWmfjkDU6aYnF8z9l36VV7xjvvuYbOrhpCJ9LGFSfmG3wswo8OH4XyRSHd3y7qrSYIGujtymrzozXo2MrMU3Rj2bW5MIEZSxleIVje4PHWOfZwwn3hwvqM/nyknzfNwPCidTsP3Q2FwfBtZYo1cIXH41bzjs4Bxb8+KJqwTcerzB1pT4qsoPnoYW0fnZE7NHVNhfNx53LdctclFerHTLMw== hybris@sparks + + ## does this make sense?? + source_cloud_image_name: CentOS-7-x86_64-GenericCloud.qcow2 + source_cloud_image_url: "https://cloud.centos.org/centos/7/images/{{ source_cloud_image_name }}" + children: k8s: children: