From 8da5a549fcbaa095062abe02e4d619ace50bf94d Mon Sep 17 00:00:00 2001 From: Dmytro Dovbii Date: Fri, 15 Jul 2016 13:59:31 +0300 Subject: [PATCH] [K8s] Delete hardcoded name of image Now app can use two images: debian 8 and ubuntu 14.04 Change-Id: I360c2d02ad1ea726448a2338852d3c190cf1f3bb --- Kubernetes/KubernetesCluster/package/UI/ui.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Kubernetes/KubernetesCluster/package/UI/ui.yaml b/Kubernetes/KubernetesCluster/package/UI/ui.yaml index 99a28b2..2612276 100644 --- a/Kubernetes/KubernetesCluster/package/UI/ui.yaml +++ b/Kubernetes/KubernetesCluster/package/UI/ui.yaml @@ -20,7 +20,7 @@ Templates: type: io.murano.resources.LinuxMuranoInstance name: generateHostname($.appConfiguration.unitNamingPattern, 1) flavor: $.instanceConfiguration.flavor - image: 'ubuntu14.04-x64-kubernetes' + image: $.instanceConfiguration.image assignFloatingIp: $.appConfiguration.assignFloatingIP keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone @@ -33,7 +33,7 @@ Templates: type: io.murano.resources.LinuxMuranoInstance name: generateHostname($.appConfiguration.unitNamingPattern, $index + 1) flavor: $.instanceConfiguration.flavor - image: 'ubuntu14.04-x64-kubernetes' + image: $.instanceConfiguration.image assignFloatingIp: $.appConfiguration.assignFloatingIP keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone @@ -48,7 +48,7 @@ Templates: type: io.murano.resources.LinuxMuranoInstance name: generateHostname($.appConfiguration.gatewayNamingPattern, $index) flavor: $.instanceConfiguration.flavor - image: 'ubuntu14.04-x64-kubernetes' + image: $.instanceConfiguration.image assignFloatingIp: $.appConfiguration.assignGatewayFloatingIP keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone @@ -205,7 +205,13 @@ Forms: min_disk: 10 min_memory_mb: 1024 min_vcpus: 1 - + - name: image + type: image + imageType: linux.kubernetes + label: Instance image + description: >- + Select valid image for the application. Image should already be prepared and + registered in glance. - name: keyPair type: keypair label: Key Pair