Merge "Revert "Add missed parts of providing versioning to stable/mitaka""

This commit is contained in:
Jenkins 2016-09-27 15:05:39 +00:00 committed by Gerrit Code Review
commit 251606b434
6 changed files with 3 additions and 10 deletions

View File

@ -11,7 +11,6 @@
# under the License.
Format: 1.3
Version: 1.0.0
Type: Library
FullName: com.mirantis.docker.Interfaces
Name: Docker Interface Library

View File

@ -15,7 +15,6 @@ Templates:
masterNode:
?:
type: com.mirantis.docker.kubernetes.KubernetesMasterNode
classVersion: 1.0.0
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -29,7 +28,6 @@ Templates:
minionNode:
?:
type: com.mirantis.docker.kubernetes.KubernetesMinionNode
classVersion: 1.0.0
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -45,7 +43,6 @@ Templates:
gatewayNode:
?:
type: com.mirantis.docker.kubernetes.KubernetesGatewayNode
classVersion: 1.0.0
instance:
?:
type: io.murano.resources.LinuxMuranoInstance
@ -59,7 +56,6 @@ Templates:
Application:
?:
type: com.mirantis.docker.kubernetes.KubernetesCluster
classVersion: 1.0.0
name: $.appConfiguration.name
masterNode: $masterNode
minionNodes: repeat($minionNode, $.appConfiguration.maxMinionCount)

View File

@ -28,4 +28,4 @@ Classes:
com.mirantis.docker.kubernetes.KubernetesGatewayNode: KubernetesGatewayNode.yaml
com.mirantis.docker.kubernetes.KubernetesNode: KubernetesNode.yaml
Require:
com.mirantis.docker.Interfaces: 1.0.0
com.mirantis.docker.Interfaces:

View File

@ -11,7 +11,6 @@
# under the License.
Format: 1.3
Version: 1.0.0
Type: Library
FullName: com.mirantis.docker.kubernetes.static.KubernetesEntities
Name: Kubernetes static entities

View File

@ -15,7 +15,6 @@ Version: 2
Application:
?:
type: com.mirantis.docker.kubernetes.KubernetesPod
classVersion: 1.0.0
name: $.appConfiguration.name
labels: $.appConfiguration.labels
kubernetesCluster: $.appConfiguration.kubernetesCluster

View File

@ -24,5 +24,5 @@ Tags: [docker, kubernetes, pod]
Classes:
com.mirantis.docker.kubernetes.KubernetesPod: KubernetesPod.yaml
Require:
com.mirantis.docker.Interfaces: 1.0.0
com.mirantis.docker.kubernetes.KubernetesCluster: 1.0.0
com.mirantis.docker.Interfaces:
com.mirantis.docker.kubernetes.KubernetesCluster: