From d44ea97fd357fc089c4ee23ff54757ec251daea2 Mon Sep 17 00:00:00 2001 From: Ekaterina Chernova Date: Tue, 14 Apr 2015 17:24:37 +0300 Subject: [PATCH] Add requirements to docker host and k8s cluster Since now, all flavors that have less than 10 GB disk will not be added to the possible selection. Also, unnecessary backslashes were removed. Change-Id: I0839a4252957acd2be9dddbd335674c22c3d57a5 --- DockerStandaloneHost/package/UI/ui.yaml | 4 ++++ Kubernetes/KubernetesCluster/package/UI/ui.yaml | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/DockerStandaloneHost/package/UI/ui.yaml b/DockerStandaloneHost/package/UI/ui.yaml index a8aefc1..23fd9df 100644 --- a/DockerStandaloneHost/package/UI/ui.yaml +++ b/DockerStandaloneHost/package/UI/ui.yaml @@ -53,6 +53,10 @@ Forms: Select registered in Openstack flavor. Consider that application performance depends on this parameter. required: false + requirements: + min_disk: 10 + min_memory_mb: 1024 + min_vcpus: 1 - name: keyPair type: keypair label: Key Pair diff --git a/Kubernetes/KubernetesCluster/package/UI/ui.yaml b/Kubernetes/KubernetesCluster/package/UI/ui.yaml index 5acb4f4..9f551cc 100644 --- a/Kubernetes/KubernetesCluster/package/UI/ui.yaml +++ b/Kubernetes/KubernetesCluster/package/UI/ui.yaml @@ -86,8 +86,8 @@ Forms: required: false - name: unitNamingPattern type: string - initial: 'kube-#' - helpText: \'#\' expands to machine sequence number + initial: kube-# + helpText: "# expands to machine sequence number" required: false description: >- For your convenience instance hostname can be specified. @@ -132,7 +132,7 @@ Forms: required: false regexpValidator: '^(([a-zA-Z0-9#][a-zA-Z0-9-#]*[a-zA-Z0-9#])\.)*([A-Za-z0-9#]|[A-Za-z0-9#][A-Za-z0-9-#]*[A-Za-z0-9#])$' label: Gateway hostname pattern - helpText: \'#\' expands to gateway sequence number + helpText: "# expands to gateway sequence number" description: >- Check to assign floating IP to gateway nodes - name: dockerRegistry @@ -157,6 +157,11 @@ Forms: Select one of the existing flavors. Consider that application performance depends on this parameter. required: false + requirements: + min_disk: 10 + min_memory_mb: 1024 + min_vcpus: 1 + - name: keyPair type: keypair label: Key Pair