Merge "Update UI definitions to 2.2 version" into stable/liberty

This commit is contained in:
Jenkins 2015-09-28 15:29:02 +00:00 committed by Gerrit Code Review
commit b2f0c30e49
30 changed files with 40 additions and 221 deletions

View File

@ -22,8 +22,6 @@ Name: ApacheHttpServer
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
enablePHP:
Contract: $.bool()

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.apps.apache.ApacheHttpServer
name: $.appConfiguration.name
enablePHP: $.appConfiguration.enablePHP
instance:
?:
@ -46,13 +45,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: 'ApacheHttpServer'
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: enablePHP
label: Enable PHP
type: boolean

View File

@ -11,9 +11,6 @@ Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
instance:
Contract: $.class(res:Instance).notNull()

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.conflang.chef.GitChef
name: $.appConfiguration.name
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -45,13 +44,6 @@ Forms:
description: ' '
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: 'Git (Chef)'
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP

View File

@ -11,8 +11,6 @@ Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
port:
Contract: $.string().notNull()
instance:

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.conflang.fiware.OrionChef
name: $.appConfiguration.name
port: $.appConfiguration.port
instance:
?:
@ -46,13 +45,6 @@ Forms:
description: ' '
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: 'Orion'
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: port
type: integer
label: Port

View File

@ -21,8 +21,6 @@ Name: CloudFoundry
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
instance:
Contract: $.class(res:Instance).notNull()

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.apps.paas.CloudFoundry
name: $.appConfiguration.name
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -44,13 +43,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: CF
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP

View File

@ -21,9 +21,6 @@ Name: CloudFoundryDiego
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
instance:
Contract: $.class(res:Instance).notNull()

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.apps.paas.CloudFoundryDiego
name: $.appConfiguration.name
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -44,13 +43,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: CF
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP

View File

@ -21,8 +21,6 @@ Name: Guacamole
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
username:
Contract: $.string().notNull()
password:
@ -55,5 +53,5 @@ Methods:
- $address: $.server.instance.floatingIpAddress
Else:
- $address: $.server.instance.ipAddresses[0]
- $._environment.reporter.report($this, 'Guacamole {0} is available at http://{1}:{2}/guacamole'.format($.name, $address, 8080))
- $._environment.reporter.report($this, 'Guacamole application is available at http://{1}:{2}/guacamole'.format($address, 8080))
- $.setAttr(deployed, true)

View File

@ -10,12 +10,11 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2
Version: 2.2
Application:
?:
type: io.murano.apps.Guacamole
name: $.appConfiguration.name
username: $.appConfiguration.username
password: $.appConfiguration.password
server: $.appConfiguration.server
@ -28,13 +27,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: Guacamole
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: username
type: string
label: Username

View File

@ -9,9 +9,6 @@ Name: HDPSandbox
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
instance:
Contract: $.class(res:Instance).notNull()

View File

@ -1,4 +1,4 @@
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -10,7 +10,6 @@ Templates:
Application:
?:
type: io.murano.apps.HDPSandbox
name: $.appConfiguration.name
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -24,15 +23,6 @@ Application:
customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet)
Forms:
- appConfiguration:
fields:
- name: name
type: string
label: Application Name
initial: 'HDP-Sandbox'
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- instanceConfiguration:
fields:
- name: flavor

View File

@ -24,8 +24,6 @@ Extends:
Properties:
instance:
Contract: $.class(res:Instance).notNull()
name:
Contract: $.string().notNull()
database:
Contract: $.string()
username:

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.databases.MySql
name: $.appConfiguration.name
database: $.initDatabaseConfiguration.database
username: $.initDatabaseConfiguration.username
password: $.initDatabaseConfiguration.password
@ -34,35 +33,13 @@ Application:
image: $.instanceConfiguration.osImage
keyname: $.instanceConfiguration.keyPair
availabilityZone: $.instanceConfiguration.availabilityZone
assignFloatingIp: $.appConfiguration.assignFloatingIP
assignFloatingIp: $.instanceConfiguration.assignFloatingIP
networks:
useEnvironmentNetwork: $.instanceConfiguration.network[0]=null
useFlatNetwork: false
customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet)
Forms:
- appConfiguration:
fields:
- name: license
type: string
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: MySqlDB
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP
description: >-
Select to true to assign floating IP automatically
initial: false
required: false
- initDatabaseConfiguration:
fields:
- name: title
@ -112,6 +89,13 @@ Forms:
description: >-
Select valid image for the application. Image should already be prepared and
registered in glance.
- name: assignFloatingIP
type: boolean
label: Assign Floating IP
description: >-
Select to true to assign floating IP automatically
initial: false
required: false
- name: keyPair
type: keypair
label: Key Pair

View File

@ -24,8 +24,6 @@ Extends:
Properties:
instance:
Contract: $.class(res:Instance).notNull()
name:
Contract: $.string().notNull()
database:
Contract: $.string()
username:

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.databases.PostgreSql
name: $.appConfiguration.name
database: $.initDatabaseConfiguration.database
username: $.initDatabaseConfiguration.username
password: $.initDatabaseConfiguration.password
@ -34,34 +33,13 @@ Application:
image: $.instanceConfiguration.osImage
keyname: $.instanceConfiguration.keyPair
availabilityZone: $.instanceConfiguration.availabilityZone
assignFloatingIp: $.appConfiguration.assignFloatingIP
assignFloatingIp: $.instanceConfiguration.assignFloatingIP
networks:
useEnvironmentNetwork: $.instanceConfiguration.network[0]=null
useFlatNetwork: false
customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet)
Forms:
- appConfiguration:
fields:
- name: license
type: string
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: PostgreDB
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP
description: >-
Select to true to assign floating IP automatically
initial: false
required: false
- initDatabaseConfiguration:
fields:
- name: title
@ -110,6 +88,13 @@ Forms:
description: >-
Select valid image for the application. Image should already be prepared and
registered in glance.
- name: assignFloatingIP
type: boolean
label: Assign Floating IP
description: >-
Select to true to assign floating IP automatically
initial: false
required: false
- name: keyPair
type: keypair
label: Key Pair

View File

@ -11,9 +11,6 @@ Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
port:
Contract: $.string().notNull()

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.conflang.puppet.MySQLPuppet
name: $.appConfiguration.name
port: $.appConfiguration.port
instance:
?:
@ -52,13 +51,6 @@ Forms:
description: 'MySQL port'
required: true
initial: 3306
- name: name
type: string
label: Application Name
initial: 'MySQL (Puppet)'
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP

View File

@ -22,9 +22,6 @@ Name: Rally
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
instance:
Contract: $.class(res:LinuxMuranoInstance).notNull()

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: org.openstack.Rally
name: $.appConfiguration.name
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -45,13 +44,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: 'Rally'
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP

View File

@ -22,9 +22,6 @@ Name: Tomcat
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
instance:
Contract: $.class(res:Instance).notNull()

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.apps.apache.Tomcat
name: $.appConfiguration.name
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -31,34 +30,13 @@ Application:
image: $.instanceConfiguration.osImage
keyname: $.instanceConfiguration.keyPair
availabilityZone: $.instanceConfiguration.availabilityZone
assignFloatingIp: $.appConfiguration.assignFloatingIP
assignFloatingIp: $.instanceConfiguration.assignFloatingIP
networks:
useEnvironmentNetwork: $.instanceConfiguration.network[0]=null
useFlatNetwork: false
customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet)
Forms:
- appConfiguration:
fields:
- name: license
type: string
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: Tomcat
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP
description: >-
Select to true to assign floating IP automatically
initial: false
required: false
- instanceConfiguration:
fields:
- name: title
@ -80,6 +58,13 @@ Forms:
description: >-
Select a valid image for the application. Image should already be prepared and
registered in glance.
- name: assignFloatingIP
type: boolean
label: Assign Floating IP
description: >-
Select to true to assign floating IP automatically
initial: false
required: false
- name: keyPair
type: keypair
label: Key Pair

View File

@ -22,8 +22,6 @@ Name: WordPress
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
server:
Contract: $.class(srv:ApacheHttpServer).notNull()
database:

View File

@ -10,12 +10,11 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2
Version: 2.2
Application:
?:
type: io.murano.apps.WordPress
name: $.appConfiguration.name
database: $.appConfiguration.database
server: $.appConfiguration.server
monitoring: $.appConfiguration.zabbix
@ -32,13 +31,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: 'WordPress'
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: database
type: io.murano.databases.MySql
label: Database Server

View File

@ -22,8 +22,6 @@ Name: ZabbixAgent
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
hostname:
Contract: $.string().notNull()
probe:

View File

@ -10,12 +10,11 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2
Version: 2.2
Application:
?:
type: io.murano.apps.ZabbixAgent
name: $.appConfiguration.name
hostname: $.appConfiguration.hostname
server: $.appConfiguration.server
probe: $.appConfiguration.probeMethod
@ -29,14 +28,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: ZabbixAgent
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: hostname
type: string
label: HostName

View File

@ -22,8 +22,6 @@ Name: ZabbixServer
Extends: std:Application
Properties:
name:
Contract: $.string().notNull()
instance:
Contract: $.class(res:Instance).notNull()
database:

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2.1
Version: 2.2
Templates:
customJoinNet:
@ -22,7 +22,6 @@ Templates:
Application:
?:
type: io.murano.apps.ZabbixServer
name: $.appConfiguration.name
database: $.dbConfiguration.database
username: $.dbConfiguration.username
password: $.dbConfiguration.password
@ -48,13 +47,6 @@ Forms:
description: Apache License, Version 2.0
hidden: true
required: false
- name: name
type: string
label: Application Name
initial: ZabbixServer
description: >-
Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
underline are allowed
- name: assignFloatingIP
type: boolean
label: Assign Floating IP