From aa0b74f906055a9a2724b768dad0ff2da42f8733 Mon Sep 17 00:00:00 2001 From: Sergey Kraynev Date: Tue, 27 Sep 2016 14:57:59 +0000 Subject: [PATCH] Revert "Add missed parts of providing versioning to stable/mitaka" This reverts commit 437183a3c70cef36d9451a1b5e30e2aaf9f26417. Change-Id: I47926599432708df4186f724f1ce582444b6add4 --- DockerInterfacesLibrary/package/manifest.yaml | 1 - Kubernetes/KubernetesCluster/package/UI/ui.yaml | 4 ---- Kubernetes/KubernetesCluster/package/manifest.yaml | 2 +- Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml | 1 - Kubernetes/KubernetesPod/package/UI/ui.yaml | 1 - Kubernetes/KubernetesPod/package/manifest.yaml | 4 ++-- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/DockerInterfacesLibrary/package/manifest.yaml b/DockerInterfacesLibrary/package/manifest.yaml index 52c9990..1afc04d 100644 --- a/DockerInterfacesLibrary/package/manifest.yaml +++ b/DockerInterfacesLibrary/package/manifest.yaml @@ -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 diff --git a/Kubernetes/KubernetesCluster/package/UI/ui.yaml b/Kubernetes/KubernetesCluster/package/UI/ui.yaml index 134e19f..68c7473 100644 --- a/Kubernetes/KubernetesCluster/package/UI/ui.yaml +++ b/Kubernetes/KubernetesCluster/package/UI/ui.yaml @@ -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) diff --git a/Kubernetes/KubernetesCluster/package/manifest.yaml b/Kubernetes/KubernetesCluster/package/manifest.yaml index 710a9fc..29c72a5 100644 --- a/Kubernetes/KubernetesCluster/package/manifest.yaml +++ b/Kubernetes/KubernetesCluster/package/manifest.yaml @@ -26,4 +26,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: diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml index 69b41d9..bef4d65 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml @@ -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 diff --git a/Kubernetes/KubernetesPod/package/UI/ui.yaml b/Kubernetes/KubernetesPod/package/UI/ui.yaml index d693201..e72b1e9 100644 --- a/Kubernetes/KubernetesPod/package/UI/ui.yaml +++ b/Kubernetes/KubernetesPod/package/UI/ui.yaml @@ -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 diff --git a/Kubernetes/KubernetesPod/package/manifest.yaml b/Kubernetes/KubernetesPod/package/manifest.yaml index 201173a..f18de16 100644 --- a/Kubernetes/KubernetesPod/package/manifest.yaml +++ b/Kubernetes/KubernetesPod/package/manifest.yaml @@ -22,5 +22,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: