[BUG] Virtual machine "kind" mismatch

[sk4zuzu]

Describe the bug
In the cluster config we use infrastructure/machine documents to define virtual machines:
https://github.com/epiphany-platform/epiphany/blob/develop/core/src/epicli/data/any/defaults/configuration/minimal-cluster-config.yml#L50

But the infrastructure/machine.yml template seems to have different "kind":
https://github.com/epiphany-platform/epiphany/blob/develop/core/src/epicli/data/common/defaults/infrastructure/machine.yml#L1

So in any type of automation mentioned template cannot be used to render virtual machine configs.

To Reproduce
N/A

Expected behavior
"Kinds" should be identical. Existing configs should still work without any change.

Config files
Links already provided.

OS (please complete the following information):
ALL

Cloud Environment (please complete the following information):
"any"

Additional context
N/A

[erzetpe]

In this task we also need to clarify where we should have infrastructure/machine and where infrastructure/virtual-machine.

[przemyslavic]

Tested epicli init, epicli init --full and epicli apply for any provider and it works fine when testing exactly this PR.
However, the current develop is broken.
To reproduce:

1. Execute epicli init -p any -n anytest
2. Execute epicli apply -f anytest.yml

epiuser@e72902465e4d:/shared$ epicli apply -f /shared/build/anydev/anydev.yml
Provide password to encrypt vault:
11:28:52 INFO cli.engine.schema.DefaultMerger - Starting step
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: epiphany-cluster name: default
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-repository
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-k8s-master1
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-k8s-node1
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-k8s-node2
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-logging
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-monitoring
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-kafka1
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-kafka2
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-postgresql
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-loadbalancer
11:28:52 INFO cli.engine.schema.DefaultMerger - Merging: infrastructure/machine name: default-rabbitmq
11:28:52 INFO cli.engine.schema.DefaultMerger - Step finished in: 0.05s
11:28:52 INFO cli.engine.schema.SchemaValidator - Starting step
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: epiphany-cluster - anydev
11:28:52 INFO cli.engine.schema.SchemaValidator - Step finished in: 0.05s
11:28:52 INFO cli.engine.providers.any.InfrastructureBuilder - Starting step
11:28:52 INFO cli.engine.providers.any.InfrastructureBuilder - Step finished in: 0.00s
11:28:52 INFO cli.engine.schema.SchemaValidator - Starting step
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: infrastructure/machine
11:28:52 INFO cli.engine.schema.SchemaValidator - Step finished in: 0.07s
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Starting step
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/feature-mapping
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/shared-config
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/kubernetes-master
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/helm
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/applications
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/node-exporter
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/filebeat
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/firewall
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/vault
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/kubernetes-node
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/logging
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/kibana
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/prometheus
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/grafana
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/zookeeper
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/jmx-exporter
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/kafka
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/kafka-exporter
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/postgresql
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/postgres-exporter
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/haproxy
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/haproxy-exporter
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/rabbitmq
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/repository
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Adding: configuration/image-registry
11:28:52 INFO cli.engine.schema.ConfigurationAppender - Step finished in: 0.36s
11:28:52 INFO cli.engine.schema.SchemaValidator - Starting step
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: configuration/feature-mapping
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: configuration/shared-config
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: epiphany-cluster - anydev
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: configuration/kubernetes-master
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: configuration/helm
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: configuration/applications
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: configuration/node-exporter
11:28:52 INFO cli.engine.schema.SchemaValidator - Validating: configuration/filebeat
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/firewall
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/vault
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/kubernetes-node
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/logging
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/kibana
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/prometheus
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/grafana
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/zookeeper
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/jmx-exporter
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/kafka
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/kafka-exporter
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/postgresql
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/postgres-exporter
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/haproxy
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/haproxy-exporter
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/rabbitmq
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/repository
11:28:53 INFO cli.engine.schema.SchemaValidator - Validating: configuration/image-registry
11:28:53 INFO cli.engine.schema.SchemaValidator - Step finished in: 0.76s
11:28:53 INFO cli.engine.providers.any.InfrastructureConfigCollector - Starting step
11:28:53 INFO cli.engine.ansible.AnsibleRunner - Starting step
11:28:53 INFO cli.engine.ansible.AnsibleRunner - Copying Ansible resources
11:29:01 INFO cli.engine.ansible.AnsibleInventoryCreator - Creating Ansible inventory
11:29:11 INFO cli.engine.ansible.AnsibleConfigFileCreator - Creating ansible.cfg
11:29:11 INFO cli.engine.ansible.AnsibleVarsGenerator - Generate Ansible vars
11:29:11 WARNING cli.engine.ansible.AnsibleVarsGenerator - No config document for enabled role: opendistro-for-elasticsearch
11:29:11 WARNING cli.engine.ansible.AnsibleVarsGenerator - No config document for enabled role: elasticsearch-curator
11:29:11 WARNING cli.engine.ansible.AnsibleVarsGenerator - No config document for enabled role: logstash
11:29:12 WARNING cli.engine.ansible.AnsibleVarsGenerator - No config document for enabled role: ignite
11:29:12 ERROR epicli - No such attribute: cloud

I suppose that got broken in #2497 (PR #2599). @seriva could you please confirm so we can proceed with this task and then I'll put a comment in #2497.

[seriva]

Yeah this is the result of the changes in #2497