From 3e8c0e35d40d5a47a7e84e75979e17820dee8f76 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 26 Oct 2020 17:10:27 +0100 Subject: don't use main.yml inside group_vars --- inventory/group_vars/k8s-emc/main.yml | 54 ----------------------------------- inventory/group_vars/k8s-emc/vars.yml | 54 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 inventory/group_vars/k8s-emc/main.yml create mode 100644 inventory/group_vars/k8s-emc/vars.yml (limited to 'inventory/group_vars/k8s-emc') diff --git a/inventory/group_vars/k8s-emc/main.yml b/inventory/group_vars/k8s-emc/main.yml deleted file mode 100644 index 28b7c785..00000000 --- a/inventory/group_vars/k8s-emc/main.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -docker_pkg_provider: docker-com -docker_pkg_name: docker-ce - -kubernetes_version: 1.17.2 -kubernetes_container_runtime: docker -kubernetes_network_plugin: kubeguard - -kubernetes: - cluster_name: emc - - dedicated_master: False - api_extra_sans: - - 178.63.180.137 - - emc-master.elev8.at - - pod_ip_range: 172.18.0.0/16 - pod_ip_range_size: 24 - service_ip_range: 172.18.192.0/18 - - -kubernetes_secrets: - encryption_config_keys: "{{ vault_kubernetes_encryption_config_keys }}" - - -kubeguard: - ## node_index must be in the range between 1 and 190 -> 189 hosts possible - ## - ## hardcoded hostnames are not nice but if we do this via host_vars - ## the info is spread over multiple files and this makes it more diffcult - ## to find mistakes, so it is nicer to keep it in one place... - node_index: - emc-01: 1 - emc-02: 2 - emc-03: 3 - emc-04: 4 - emc-05: 5 - emc-06: 6 - emc-00: 100 - emc-dist0: 110 - ele-dione: 111 - ele-helene: 112 - emc-master: 127 - - direct_net_zones: - encoder: - transfer_net: 172.18.191.0/24 - node_interface: - ele-dione: eno2 - ele-helene: eno2 - -kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}" - -kubernetes_metrics_server_version: 0.3.7 diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml new file mode 100644 index 00000000..28b7c785 --- /dev/null +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -0,0 +1,54 @@ +--- +docker_pkg_provider: docker-com +docker_pkg_name: docker-ce + +kubernetes_version: 1.17.2 +kubernetes_container_runtime: docker +kubernetes_network_plugin: kubeguard + +kubernetes: + cluster_name: emc + + dedicated_master: False + api_extra_sans: + - 178.63.180.137 + - emc-master.elev8.at + + pod_ip_range: 172.18.0.0/16 + pod_ip_range_size: 24 + service_ip_range: 172.18.192.0/18 + + +kubernetes_secrets: + encryption_config_keys: "{{ vault_kubernetes_encryption_config_keys }}" + + +kubeguard: + ## node_index must be in the range between 1 and 190 -> 189 hosts possible + ## + ## hardcoded hostnames are not nice but if we do this via host_vars + ## the info is spread over multiple files and this makes it more diffcult + ## to find mistakes, so it is nicer to keep it in one place... + node_index: + emc-01: 1 + emc-02: 2 + emc-03: 3 + emc-04: 4 + emc-05: 5 + emc-06: 6 + emc-00: 100 + emc-dist0: 110 + ele-dione: 111 + ele-helene: 112 + emc-master: 127 + + direct_net_zones: + encoder: + transfer_net: 172.18.191.0/24 + node_interface: + ele-dione: eno2 + ele-helene: eno2 + +kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}" + +kubernetes_metrics_server_version: 0.3.7 -- cgit v1.2.3