Merge pull request #279 from lebauce/registry-size

Make use of parameter registry_volume_size

Author: jprovaznik

fragments/bastion-ansible.sh

@@ -47,6 +47,7 @@ function create_metadata_json() {
     "deploy_registry": $([ "$deploy_registry" == "True" ] && echo true || echo false),
     "registry_volume_fs": "$registry_volume_fs",
     "registry_volume_id": "$registry_volume_id",
+    "registry_volume_size": "$registry_volume_size",
     "prepare_registry": $([ "$prepare_registry" == "True" ] && echo true || echo false),
     "heat_outputs_path": "$heat_outputs_path",
     "ssh_user": "$ssh_user",

node.yaml

@@ -259,6 +259,12 @@ parameters:
       True = Enable automatic provisioning of the Docker registry
     type: boolean
 
+  registry_volume_size:
+    description: >
+      Size of the Openshift registry persistent volume
+    type: number
+    default: 5
+
   registry_volume_id:
     description: >
       Volume to use by the Openshift registry
@@ -642,6 +648,8 @@ resources:
           default: {get_param: openshift_sdn}
         - name: deploy_registry
           default: {get_param: deploy_registry}
+        - name: registry_volume_size
+          default: {get_param: registry_volume_size}
         - name: registry_volume_id
           default: {get_param: registry_volume_id}
         - name: registry_volume_fs

openshift.yaml

@@ -661,6 +661,7 @@ resources:
           deploy_registry: {get_param: deploy_registry}
           registry_volume_id: {get_attr: [registry_volume, volume_id]}
           registry_volume_fs: {get_param: registry_volume_fs}
+          registry_volume_size: {get_param: registry_volume_size}
           prepare_registry: {get_param: prepare_registry}
           deploy_router: {get_param: deploy_router}
           os_auth_url: {get_param: os_auth_url}

templates/var/lib/ansible/group_vars/OSv3.yml

@@ -60,7 +60,7 @@ openshift_registry_selector: region=infra
 openshift_hosted_registry_storage_create_pv: true
 openshift_hosted_registry_storage_kind: openstack
 openshift_hosted_registry_storage_volume_name: registry
-openshift_hosted_registry_storage_volume_size: 5Gi
+openshift_hosted_registry_storage_volume_size: {{registry_volume_size}}Gi
 openshift_hosted_registry_storage_access_modes:
   - ReadWriteOnce
 openshift_hosted_registry_storage_openstack_volumeID: {{registry_volume_id}}