diff --git a/Chef/GitChef/package/UI/ui.yaml b/Chef/GitChef/package/UI/ui.yaml index 5d836b85..bad5ff7b 100644 --- a/Chef/GitChef/package/UI/ui.yaml +++ b/Chef/GitChef/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -25,6 +32,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -86,6 +97,12 @@ Forms: label: Availability zone description: Select availability zone where application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern diff --git a/Chef/OrionChef/package/UI/ui.yaml b/Chef/OrionChef/package/UI/ui.yaml index 533337ca..4b4d5f4e 100644 --- a/Chef/OrionChef/package/UI/ui.yaml +++ b/Chef/OrionChef/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -26,6 +33,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -93,6 +104,12 @@ Forms: label: Availability zone description: Select availability zone where application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern diff --git a/CloudFoundry/package/UI/ui.yaml b/CloudFoundry/package/UI/ui.yaml index ff31d93b..c18bf2bc 100644 --- a/CloudFoundry/package/UI/ui.yaml +++ b/CloudFoundry/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -24,6 +31,10 @@ Application: image: $.instanceConfiguration.osImage keyname: $.instanceConfiguration.keyPair assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -75,6 +86,12 @@ Forms: Select a Key Pair to control access to instances. You can login to instances using this KeyPair after the deployment of application. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern label: Hostname type: string diff --git a/CloudFoundryDiego/package/UI/ui.yaml b/CloudFoundryDiego/package/UI/ui.yaml index 9b783bcf..8a4514f3 100644 --- a/CloudFoundryDiego/package/UI/ui.yaml +++ b/CloudFoundryDiego/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -24,6 +31,10 @@ Application: image: 'murano-bosh-cf-diego' keyname: $.instanceConfiguration.keyPair assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -68,6 +79,12 @@ Forms: Select a Key Pair to control access to instances. You can login to instances using this KeyPair after the deployment of application. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern label: Hostname type: string diff --git a/HDPSandbox/package/UI/ui.yaml b/HDPSandbox/package/UI/ui.yaml index 1eb8602c..ac121784 100644 --- a/HDPSandbox/package/UI/ui.yaml +++ b/HDPSandbox/package/UI/ui.yaml @@ -1,4 +1,11 @@ -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -11,6 +18,10 @@ Application: flavor: $.instanceConfiguration.flavor image: 'hdp-sandbox' assignFloatingIp: true + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -35,6 +46,12 @@ Forms: min_disk: 50 min_memory_mb: 4096 min_vcpus: 1 + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern label: Hostname type: string diff --git a/MySQL/package/UI/ui.yaml b/MySQL/package/UI/ui.yaml index 7f16a374..3f3cd37f 100644 --- a/MySQL/package/UI/ui.yaml +++ b/MySQL/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -28,6 +35,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -113,6 +124,12 @@ Forms: label: Availability zone description: Select availability zone where the application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern diff --git a/PostgreSQL/package/UI/ui.yaml b/PostgreSQL/package/UI/ui.yaml index 33a96dee..9b205be7 100644 --- a/PostgreSQL/package/UI/ui.yaml +++ b/PostgreSQL/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -28,6 +35,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -111,6 +122,12 @@ Forms: label: Availability zone description: Select availability zone where the application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern diff --git a/Puppet/MySQLPuppet/package/UI/ui.yaml b/Puppet/MySQLPuppet/package/UI/ui.yaml index 1636a97a..ceb5df78 100644 --- a/Puppet/MySQLPuppet/package/UI/ui.yaml +++ b/Puppet/MySQLPuppet/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -26,6 +33,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -93,6 +104,12 @@ Forms: label: Availability zone description: Select availability zone where application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern diff --git a/Rally/package/UI/ui.yaml b/Rally/package/UI/ui.yaml index 9d02cdb1..a5090483 100644 --- a/Rally/package/UI/ui.yaml +++ b/Rally/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -25,6 +32,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -88,6 +99,12 @@ Forms: label: Availability zone description: Select availability zone where application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern diff --git a/Tomcat/package/UI/ui.yaml b/Tomcat/package/UI/ui.yaml index 18a40fd3..4c04252e 100644 --- a/Tomcat/package/UI/ui.yaml +++ b/Tomcat/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -25,6 +32,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -83,6 +94,12 @@ Forms: label: Availability zone description: Select availability zone where the application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern diff --git a/Windows/ActiveDirectory/package/UI/ui.yaml b/Windows/ActiveDirectory/package/UI/ui.yaml index 7f86a50c..5147747d 100644 --- a/Windows/ActiveDirectory/package/UI/ui.yaml +++ b/Windows/ActiveDirectory/package/UI/ui.yaml @@ -1,4 +1,4 @@ -Version: 2 +Version: 2.1 Templates: primaryController: @@ -14,6 +14,10 @@ Templates: availabilityZone: $.instanceConfiguration.availabilityZone keyname: $.instanceConfiguration.keyPair assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) secondaryController: ?: @@ -25,6 +29,16 @@ Templates: name: generateHostname($.appConfiguration.unitNamingPattern, $index + 1) flavor: $.instanceConfiguration.flavor image: $.instanceConfiguration.osImage + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) + + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: @@ -174,6 +188,13 @@ Forms: Select valid image for a service. Image should already be prepared and registered in glance. + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate + - name: availabilityZone type: azone label: Availability zone diff --git a/ZabbixServer/package/UI/ui.yaml b/ZabbixServer/package/UI/ui.yaml index 5ab4b02d..35d12baf 100644 --- a/ZabbixServer/package/UI/ui.yaml +++ b/ZabbixServer/package/UI/ui.yaml @@ -10,7 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.1 + +Templates: + customJoinNet: + - ?: + type: io.murano.resources.ExistingNeutronNetwork + internalNetworkName: $.instanceConfiguration.network[0] + internalSubnetworkName: $.instanceConfiguration.network[1] Application: ?: @@ -28,6 +35,10 @@ Application: keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone assignFloatingIp: $.appConfiguration.assignFloatingIP + networks: + useEnvironmentNetwork: $.instanceConfiguration.network[0]=null + useFlatNetwork: false + customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - appConfiguration: @@ -106,6 +117,12 @@ Forms: label: Availability zone description: Select availability zone where the application would be installed. required: false + - name: network + type: network + label: Network + description: Select a network to join. 'Auto' corresponds to a default environment's network. + required: false + murano_networks: translate - name: unitNamingPattern type: string label: Instance Naming Pattern