From 034cf953db5d0519eb327136abd72a2ee6f32bfd Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Apr 01 2023 08:29:16 +0000 Subject: aws: allow to use gp3 storage type for fedimg this is cheaper than gp2 see https://fedoraproject.org/wiki/Changes/CloudEC2gp3 --- diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2 index e3806a3..a7c5495 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-iad2-prod.j2 @@ -688,8 +688,8 @@ openshift_hosted_metrics_deploy=true #openshift_metrics_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{ openshift_image_tag }" # # StorageClass -# openshift_storageclass_name=gp2 -# openshift_storageclass_parameters={'type': 'gp2', 'encrypted': 'false'} +# openshift_storageclass_name=gp3 +# openshift_storageclass_parameters={'type': 'gp3', 'encrypted': 'false'} # openshift_storageclass_mount_options=['dir_mode=0777', 'file_mode=0777'] # openshift_storageclass_reclaim_policy="Delete" # diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 index 35e6386..e694dd6 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory-stg.j2 @@ -669,8 +669,8 @@ openshift_hosted_metrics_deploy=true #openshift_metrics_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{ openshift_image_tag }" # # StorageClass -# openshift_storageclass_name=gp2 -# openshift_storageclass_parameters={'type': 'gp2', 'encrypted': 'false'} +# openshift_storageclass_name=gp3 +# openshift_storageclass_parameters={'type': 'gp3', 'encrypted': 'false'} # openshift_storageclass_mount_options=['dir_mode=0777', 'file_mode=0777'] # openshift_storageclass_reclaim_policy="Delete" # diff --git a/roles/fedimg/templates/fedimg-conf.toml b/roles/fedimg/templates/fedimg-conf.toml index e849271..65bd311 100644 --- a/roles/fedimg/templates/fedimg-conf.toml +++ b/roles/fedimg/templates/fedimg-conf.toml @@ -24,7 +24,7 @@ regions = [ 'af-south-1', 'eu-north-1', 'ap-south-1', 'eu-west-3', 'eu-west-2', 'ap-northeast-1', 'sa-east-1', 'ca-central-1', 'ap-east-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-southeast-3', 'eu-central-1', 'us-east-1', 'us-east-2', 'us-west-1', 'us-west-2' ] -volume_types = ['standard', 'gp2'] +volume_types = ['standard', 'gp2', 'gp3'] [rackspace] username = 'someuser'