refactor + commenting

Author: scrungus

environments/cci1/inventory/group_vars/all/variables.yml

@@ -66,8 +66,6 @@ zenith_sshd_service_load_balancer_ip: "136.156.131.209"
 # Azimuth configuration
 #####
 
-azimuth_capi_operator_external_network_id: "{{ infra_external_network_id }}"
-
 azimuth_capi_operator_capi_helm_openstack_loadbalancer_provider: amphora
 capi_cluster_addons_openstack_loadbalancer_provider: amphora
 

environments/ecmwf-base/ansible.cfg

@@ -20,7 +20,8 @@ infra_data_volume_size: 50
 capi_cluster_control_plane_flavor: 8cpu-8gbmem-30gbdisk
 # The name of the flavor to use for worker nodes
 capi_cluster_worker_flavor: 16cpu-16gbmem-30gbdisk
-capi_cluster_control_plane_count: 1
+# The number of control plane nodes
+capi_cluster_control_plane_count: 3
 # The number of worker nodes
 capi_cluster_worker_count: 3
 # The fixed floating IP to associate with the load balancer for the ingress controller
@@ -76,6 +77,8 @@ harbor_enabled: no
 
 azimuth_capi_operator_external_network_id: "{{ infra_external_network_id }}"
 
+openstack_loadbalancer_provider: ovn
+
 # The name of the current cloud
 azimuth_current_cloud_name: ecmwf
 # The label for the current cloud

environments/ecmwf-base/clouds.yaml

@@ -3,12 +3,12 @@
 #####
 
 # The ID of an existing network to create the node on
-infra_network_id: "2692933e-244f-4a3b-aa18-4daaf3383838"
+infra_network_id: "2692933e-244f-4a3b-aa18-4daaf3383838" # azimuth-tav1
 # OR
 # The CIDR of the subnet that should be created
 #infra_network_cidr: "192.168.0.0/24"
 # The ID of the external network to connect to via a router
-infra_external_network_id: cd0f63f2-f3f8-4c14-a688-4c5b9f4bed76
+infra_external_network_id: "cd0f63f2-f3f8-4c14-a688-4c5b9f4bed76" # external-internet
 
 # The fixed floating IP to associate with the machine
 # This IP must be pre-allocated to the project
@@ -19,7 +19,7 @@ infra_fixed_floatingip: "136.156.158.211"
 #infra_floatingip_pool: "<floating ip pool>"
 # OR
 # The ID of a provisioning network that will be used to access the seed node
-#infra_provisioning_network_id: a323e69c-d58d-4ca6-84e6-2ef9c965e865
+#infra_provisioning_network_id:
 
 # The image id of an Ubuntu 20.04 image to use for the node
 #   N.B. This is populated automatically using community images by default
@@ -28,21 +28,24 @@ infra_fixed_floatingip: "136.156.158.211"
 # The id of the flavor to use for the node
 # For a seed node for an HA cluster, 8GB RAM is fine (maybe even 4GB)
 # For a single node deployment, >= 16GB RAM is recommended
-infra_flavor_id: eff1de6b-81ba-4f87-a22f-f581b23c8274
+infra_flavor_id: "eff1de6b-81ba-4f87-a22f-f581b23c8274" # 8cpu-8gbmem-30gbdisk
 
 #####
 # Configuration for the HA cluster
 #####
 
+# The number of control plane nodes
+capi_cluster_control_plane_count: 1
+
 # The fixed floating IP to associate with the load balancer for the ingress controller
 # This IP must be pre-allocated to the project and should have the wildcard ingress domain assigned to it
 capi_cluster_addons_ingress_load_balancer_ip: "136.156.158.241"
 
 # Storage settings for the management cluster
-capi_cluster_root_volume_type: "8794e72a-d2c1-418b-a408-a5f5dc633205"
+capi_cluster_root_volume_type: "8794e72a-d2c1-418b-a408-a5f5dc633205" # Ceph-HDD
 
 # Storage settings for tenant clusters
-azimuth_capi_operator_capi_helm_root_volume_type: "8794e72a-d2c1-418b-a408-a5f5dc633205"
+azimuth_capi_operator_capi_helm_root_volume_type: "8794e72a-d2c1-418b-a408-a5f5dc633205" # Ceph-HDD
 
 # Seperate etcd volume config 
 
@@ -66,10 +69,6 @@ zenith_sshd_service_load_balancer_ip: "136.156.158.206"
 # Azimuth configuration
 #####
 
-azimuth_capi_operator_external_network_id: "{{ infra_external_network_id }}"
-
-openstack_loadbalancer_provider: ovn
-
 #####
 # Terraform State
 ####