Merge "[DSH] Delete hardcoded image name" into stable/liberty

This commit is contained in:
Jenkins 2016-08-22 16:36:31 +00:00 committed by Gerrit Code Review
commit bb1e8cf210
2 changed files with 18 additions and 1 deletions

View File

@ -33,6 +33,16 @@ On Centos, Fedora:
Image building
--------------
To build Debian-based image
.. sourcecode:: bash
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${murano_apps_root}/Docker/DockerStandaloneHost/elements \
DIB_RELEASE=jessie DIB_CLOUD_INIT_DATASOURCES="Ec2, ConfigDrive, OpenStack" disk-image-create vm debian murano-agent-debian \
docker -o debian8-x64-docker
To build Ubuntu-based image
.. sourcecode:: bash
sudo ELEMENTS_PATH=${murano_agent_root}/contrib/elements:${murano_apps_root}/Docker/DockerStandaloneHost/elements disk-image-create \

View File

@ -22,7 +22,7 @@ Application:
type: io.murano.resources.LinuxMuranoInstance
name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
flavor: $.instanceConfiguration.flavor
image: 'ubuntu14.04-x64-docker'
image: $.instanceConfiguration.image
keyname: $.instanceConfiguration.keyPair
assignFloatingIp: $.appConfiguration.assignFloatingIP
availabilityZone: $.instanceConfiguration.availabilityZone
@ -63,6 +63,13 @@ Forms:
required: false
hidden: true
description: Specify some instance parameters on which the application would be created
- name: image
type: image
imageType: linux.docker
label: Instance image
description: >-
Select valid image for the application. Image should already be prepared and
registered in glance.
- name: flavor
type: flavor
label: Instance flavor