openstack
/
murano-apps
Code Issues Proposed changes

[K8s] Delete hardcoded name of image 

Closes-Bug: #1453585
Now app can use two images: debian 8 and ubuntu 14.04

Change-Id: I360c2d02ad1ea726448a2338852d3c190cf1f3bb
This commit is contained in:
Dmytro Dovbii 2016-07-15 13:59:31 +03:00
parent 698680551c
commit 55e184c466
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Docker/Kubernetes/KubernetesCluster/package/UI/ui.yaml
View File

@ -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