diff --git a/infra-config/group_vars/all/vars b/ansible/group_vars/all/vars similarity index 100% rename from infra-config/group_vars/all/vars rename to ansible/group_vars/all/vars diff --git a/infra-config/group_vars/all/vault b/ansible/group_vars/all/vault similarity index 100% rename from infra-config/group_vars/all/vault rename to ansible/group_vars/all/vault diff --git a/infra-config/group_vars/freeipa/vars b/ansible/group_vars/freeipa/vars similarity index 100% rename from infra-config/group_vars/freeipa/vars rename to ansible/group_vars/freeipa/vars diff --git a/infra-config/group_vars/hub_cluster/vars b/ansible/group_vars/hub_cluster/vars similarity index 96% rename from infra-config/group_vars/hub_cluster/vars rename to ansible/group_vars/hub_cluster/vars index b5cb96b..82fba77 100644 --- a/infra-config/group_vars/hub_cluster/vars +++ b/ansible/group_vars/hub_cluster/vars @@ -3,9 +3,6 @@ # Cluster deployed via Agent Installer and Matchbox (iPXE): -# Role of this node in the cluster. -# - master -# - worker # Name of the OpenShift Cluster cluster_name: "hub" diff --git a/infra-config/group_vars/internal_cluster/vars b/ansible/group_vars/internal_cluster/vars similarity index 96% rename from infra-config/group_vars/internal_cluster/vars rename to ansible/group_vars/internal_cluster/vars index 36d3327..cd08931 100644 --- a/infra-config/group_vars/internal_cluster/vars +++ b/ansible/group_vars/internal_cluster/vars @@ -3,9 +3,6 @@ # Cluster deployed via Agent Installer and Matchbox (iPXE): -# Role of this node in the cluster. -# - master -# - worker # Name of the OpenShift Cluster cluster_name: "openshift" diff --git a/infra-config/group_vars/ipaserver/main.yml b/ansible/group_vars/ipaserver/main.yml similarity index 100% rename from infra-config/group_vars/ipaserver/main.yml rename to ansible/group_vars/ipaserver/main.yml diff --git a/infra-config/group_vars/ipaserver/vars b/ansible/group_vars/ipaserver/vars similarity index 100% rename from infra-config/group_vars/ipaserver/vars rename to ansible/group_vars/ipaserver/vars diff --git a/infra-config/group_vars/matchbox_server/vars b/ansible/group_vars/matchbox_server/vars similarity index 100% rename from infra-config/group_vars/matchbox_server/vars rename to ansible/group_vars/matchbox_server/vars diff --git a/infra-config/group_vars/openshift_cluster_template/vars b/ansible/group_vars/openshift_cluster_template/vars similarity index 100% rename from infra-config/group_vars/openshift_cluster_template/vars rename to ansible/group_vars/openshift_cluster_template/vars diff --git a/infra-config/group_vars/unbound_servers/vars.yml b/ansible/group_vars/unbound_servers/vars.yml similarity index 100% rename from infra-config/group_vars/unbound_servers/vars.yml rename to ansible/group_vars/unbound_servers/vars.yml diff --git a/infra-config/host_vars/backup/vars b/ansible/host_vars/backup/vars similarity index 100% rename from infra-config/host_vars/backup/vars rename to ansible/host_vars/backup/vars diff --git a/infra-config/host_vars/docker01/vars b/ansible/host_vars/docker01/vars similarity index 100% rename from infra-config/host_vars/docker01/vars rename to ansible/host_vars/docker01/vars diff --git a/infra-config/host_vars/infra01/vars b/ansible/host_vars/infra01/vars similarity index 100% rename from infra-config/host_vars/infra01/vars rename to ansible/host_vars/infra01/vars diff --git a/infra-config/host_vars/int-master01/vars b/ansible/host_vars/int-master01/vars similarity index 100% rename from infra-config/host_vars/int-master01/vars rename to ansible/host_vars/int-master01/vars diff --git a/infra-config/host_vars/int-master02/vars b/ansible/host_vars/int-master02/vars similarity index 100% rename from infra-config/host_vars/int-master02/vars rename to ansible/host_vars/int-master02/vars diff --git a/infra-config/host_vars/int-master03/vars b/ansible/host_vars/int-master03/vars similarity index 100% rename from infra-config/host_vars/int-master03/vars rename to ansible/host_vars/int-master03/vars diff --git a/infra-config/host_vars/int-worker02/vars b/ansible/host_vars/int-worker02/vars similarity index 100% rename from infra-config/host_vars/int-worker02/vars rename to ansible/host_vars/int-worker02/vars diff --git a/infra-config/host_vars/matchbox/vars b/ansible/host_vars/matchbox/vars similarity index 100% rename from infra-config/host_vars/matchbox/vars rename to ansible/host_vars/matchbox/vars diff --git a/infra-config/host_vars/monitor/vars b/ansible/host_vars/monitor/vars similarity index 100% rename from infra-config/host_vars/monitor/vars rename to ansible/host_vars/monitor/vars diff --git a/infra-config/host_vars/n8n/vars b/ansible/host_vars/n8n/vars similarity index 100% rename from infra-config/host_vars/n8n/vars rename to ansible/host_vars/n8n/vars diff --git a/infra-config/host_vars/ocp-hub/vars b/ansible/host_vars/ocp-hub/vars similarity index 100% rename from infra-config/host_vars/ocp-hub/vars rename to ansible/host_vars/ocp-hub/vars diff --git a/infra-config/host_vars/openshift_node_template/vars b/ansible/host_vars/openshift_node_template/vars similarity index 100% rename from infra-config/host_vars/openshift_node_template/vars rename to ansible/host_vars/openshift_node_template/vars diff --git a/infra-config/host_vars/pve01/vars b/ansible/host_vars/pve01/vars similarity index 100% rename from infra-config/host_vars/pve01/vars rename to ansible/host_vars/pve01/vars diff --git a/infra-config/host_vars/pve02/vars b/ansible/host_vars/pve02/vars similarity index 100% rename from infra-config/host_vars/pve02/vars rename to ansible/host_vars/pve02/vars diff --git a/infra-config/host_vars/pve03/vars b/ansible/host_vars/pve03/vars similarity index 100% rename from infra-config/host_vars/pve03/vars rename to ansible/host_vars/pve03/vars diff --git a/infra-config/host_vars/sql01/vars b/ansible/host_vars/sql01/vars similarity index 100% rename from infra-config/host_vars/sql01/vars rename to ansible/host_vars/sql01/vars diff --git a/infra-config/host_vars/unbound01/vars b/ansible/host_vars/unbound01/vars similarity index 100% rename from infra-config/host_vars/unbound01/vars rename to ansible/host_vars/unbound01/vars diff --git a/infra-config/host_vars/unbound02/vars b/ansible/host_vars/unbound02/vars similarity index 100% rename from infra-config/host_vars/unbound02/vars rename to ansible/host_vars/unbound02/vars diff --git a/infra-config/host_vars/vm_template/vars b/ansible/host_vars/vm_template/vars similarity index 100% rename from infra-config/host_vars/vm_template/vars rename to ansible/host_vars/vm_template/vars diff --git a/infra-config/inventory.yml b/ansible/inventory.yml similarity index 100% rename from infra-config/inventory.yml rename to ansible/inventory.yml diff --git a/infra-config/playbooks/add_dhcp_entry.yml b/ansible/playbooks/add_dhcp_entry.yml similarity index 100% rename from infra-config/playbooks/add_dhcp_entry.yml rename to ansible/playbooks/add_dhcp_entry.yml diff --git a/infra-config/playbooks/add_dns_entry.yml b/ansible/playbooks/add_dns_entry.yml similarity index 100% rename from infra-config/playbooks/add_dns_entry.yml rename to ansible/playbooks/add_dns_entry.yml diff --git a/infra-config/playbooks/configure_openshift_cluster.yml b/ansible/playbooks/configure_openshift_cluster.yml similarity index 100% rename from infra-config/playbooks/configure_openshift_cluster.yml rename to ansible/playbooks/configure_openshift_cluster.yml diff --git a/infra-config/playbooks/configure_openshift_internal.yml b/ansible/playbooks/configure_openshift_internal.yml similarity index 100% rename from infra-config/playbooks/configure_openshift_internal.yml rename to ansible/playbooks/configure_openshift_internal.yml diff --git a/infra-config/playbooks/configure_prometheus.yml b/ansible/playbooks/configure_prometheus.yml similarity index 100% rename from infra-config/playbooks/configure_prometheus.yml rename to ansible/playbooks/configure_prometheus.yml diff --git a/infra-config/playbooks/configure_unbound.yml b/ansible/playbooks/configure_unbound.yml similarity index 100% rename from infra-config/playbooks/configure_unbound.yml rename to ansible/playbooks/configure_unbound.yml diff --git a/infra-config/playbooks/create_vm_from_clone.yml b/ansible/playbooks/create_vm_from_clone.yml similarity index 100% rename from infra-config/playbooks/create_vm_from_clone.yml rename to ansible/playbooks/create_vm_from_clone.yml diff --git a/infra-config/playbooks/del_dns_entry.yml b/ansible/playbooks/del_dns_entry.yml similarity index 100% rename from infra-config/playbooks/del_dns_entry.yml rename to ansible/playbooks/del_dns_entry.yml diff --git a/infra-config/playbooks/idm-servers.yml b/ansible/playbooks/idm-servers.yml similarity index 100% rename from infra-config/playbooks/idm-servers.yml rename to ansible/playbooks/idm-servers.yml diff --git a/infra-config/playbooks/monitoring.yml b/ansible/playbooks/monitoring.yml similarity index 100% rename from infra-config/playbooks/monitoring.yml rename to ansible/playbooks/monitoring.yml diff --git a/infra-config/playbooks/proxmox_clone_vm.yml b/ansible/playbooks/proxmox_clone_vm.yml similarity index 100% rename from infra-config/playbooks/proxmox_clone_vm.yml rename to ansible/playbooks/proxmox_clone_vm.yml diff --git a/infra-config/playbooks/proxmox_start_vm.yml b/ansible/playbooks/proxmox_start_vm.yml similarity index 100% rename from infra-config/playbooks/proxmox_start_vm.yml rename to ansible/playbooks/proxmox_start_vm.yml diff --git a/infra-config/playbooks/set_hostname.yml b/ansible/playbooks/set_hostname.yml similarity index 100% rename from infra-config/playbooks/set_hostname.yml rename to ansible/playbooks/set_hostname.yml diff --git a/infra-config/playbooks/tasks/configure_dhcp_entry.yml b/ansible/playbooks/tasks/configure_dhcp_entry.yml similarity index 100% rename from infra-config/playbooks/tasks/configure_dhcp_entry.yml rename to ansible/playbooks/tasks/configure_dhcp_entry.yml diff --git a/infra-config/playbooks/tasks/create_dns_record.yml b/ansible/playbooks/tasks/create_dns_record.yml similarity index 100% rename from infra-config/playbooks/tasks/create_dns_record.yml rename to ansible/playbooks/tasks/create_dns_record.yml diff --git a/infra-config/playbooks/templates/agent-config.yaml.j2 b/ansible/playbooks/templates/agent-config.yaml.j2 similarity index 100% rename from infra-config/playbooks/templates/agent-config.yaml.j2 rename to ansible/playbooks/templates/agent-config.yaml.j2 diff --git a/infra-config/playbooks/templates/groups.tf.j2 b/ansible/playbooks/templates/groups.tf.j2 similarity index 100% rename from infra-config/playbooks/templates/groups.tf.j2 rename to ansible/playbooks/templates/groups.tf.j2 diff --git a/infra-config/playbooks/templates/install-config.yaml.j2 b/ansible/playbooks/templates/install-config.yaml.j2 similarity index 100% rename from infra-config/playbooks/templates/install-config.yaml.j2 rename to ansible/playbooks/templates/install-config.yaml.j2 diff --git a/infra-config/playbooks/templates/profiles.tf.j2 b/ansible/playbooks/templates/profiles.tf.j2 similarity index 100% rename from infra-config/playbooks/templates/profiles.tf.j2 rename to ansible/playbooks/templates/profiles.tf.j2 diff --git a/infra-config/playbooks/templates/provider.tf.j2 b/ansible/playbooks/templates/provider.tf.j2 similarity index 100% rename from infra-config/playbooks/templates/provider.tf.j2 rename to ansible/playbooks/templates/provider.tf.j2 diff --git a/infra-config/playbooks/update-linux-os.yml b/ansible/playbooks/update-linux-os.yml similarity index 100% rename from infra-config/playbooks/update-linux-os.yml rename to ansible/playbooks/update-linux-os.yml diff --git a/infra-config/roles/common/files/unbound.conf b/ansible/roles/common/files/unbound.conf similarity index 100% rename from infra-config/roles/common/files/unbound.conf rename to ansible/roles/common/files/unbound.conf diff --git a/infra-config/roles/observer/defaults/main.yml b/ansible/roles/observer/defaults/main.yml similarity index 100% rename from infra-config/roles/observer/defaults/main.yml rename to ansible/roles/observer/defaults/main.yml diff --git a/infra-config/roles/observer/files/grafana/provisioning/dashboards/all.yml b/ansible/roles/observer/files/grafana/provisioning/dashboards/all.yml similarity index 100% rename from infra-config/roles/observer/files/grafana/provisioning/dashboards/all.yml rename to ansible/roles/observer/files/grafana/provisioning/dashboards/all.yml diff --git a/infra-config/roles/observer/files/grafana/provisioning/dashboards/main/cadvisor.json b/ansible/roles/observer/files/grafana/provisioning/dashboards/main/cadvisor.json similarity index 100% rename from infra-config/roles/observer/files/grafana/provisioning/dashboards/main/cadvisor.json rename to ansible/roles/observer/files/grafana/provisioning/dashboards/main/cadvisor.json diff --git a/infra-config/roles/observer/files/grafana/provisioning/dashboards/main/node-exporter.json b/ansible/roles/observer/files/grafana/provisioning/dashboards/main/node-exporter.json similarity index 100% rename from infra-config/roles/observer/files/grafana/provisioning/dashboards/main/node-exporter.json rename to ansible/roles/observer/files/grafana/provisioning/dashboards/main/node-exporter.json diff --git a/infra-config/roles/observer/files/grafana/provisioning/datasources/all.yml b/ansible/roles/observer/files/grafana/provisioning/datasources/all.yml similarity index 100% rename from infra-config/roles/observer/files/grafana/provisioning/datasources/all.yml rename to ansible/roles/observer/files/grafana/provisioning/datasources/all.yml diff --git a/infra-config/roles/observer/files/prometheus_alerts_rules.yml b/ansible/roles/observer/files/prometheus_alerts_rules.yml similarity index 100% rename from infra-config/roles/observer/files/prometheus_alerts_rules.yml rename to ansible/roles/observer/files/prometheus_alerts_rules.yml diff --git a/infra-config/roles/observer/files/prometheus_main.yml b/ansible/roles/observer/files/prometheus_main.yml similarity index 100% rename from infra-config/roles/observer/files/prometheus_main.yml rename to ansible/roles/observer/files/prometheus_main.yml diff --git a/infra-config/roles/observer/tasks/main.yml b/ansible/roles/observer/tasks/main.yml similarity index 100% rename from infra-config/roles/observer/tasks/main.yml rename to ansible/roles/observer/tasks/main.yml diff --git a/infra-config/roles/observer/templates/alertmanager/alertmanager.j2 b/ansible/roles/observer/templates/alertmanager/alertmanager.j2 similarity index 100% rename from infra-config/roles/observer/templates/alertmanager/alertmanager.j2 rename to ansible/roles/observer/templates/alertmanager/alertmanager.j2 diff --git a/infra-config/roles/requirements.yml b/ansible/roles/requirements.yml similarity index 100% rename from infra-config/roles/requirements.yml rename to ansible/roles/requirements.yml diff --git a/infra-config/roles/target/defaults/main.yml b/ansible/roles/target/defaults/main.yml similarity index 100% rename from infra-config/roles/target/defaults/main.yml rename to ansible/roles/target/defaults/main.yml diff --git a/infra-config/roles/target/tasks/main.yml b/ansible/roles/target/tasks/main.yml similarity index 100% rename from infra-config/roles/target/tasks/main.yml rename to ansible/roles/target/tasks/main.yml diff --git a/infra-config/templates/dns.tf.j2 b/ansible/templates/dns.tf.j2 similarity index 100% rename from infra-config/templates/dns.tf.j2 rename to ansible/templates/dns.tf.j2 diff --git a/infra-config/templates/dns_provider.tf.j2 b/ansible/templates/dns_provider.tf.j2 similarity index 100% rename from infra-config/templates/dns_provider.tf.j2 rename to ansible/templates/dns_provider.tf.j2