Feature/alien 2.2.0 (#39)

* Update to Alien 2.2.0 * Fix yaml issues
alien4cloud · Apr 17, 2020 · d08f5ac · d08f5ac
1 parent 7aad2e6
commit d08f5ac
Showing 102 changed files with 448 additions and 452 deletions.
diff --git a/org/alien4cloud/agentpuppet/agent-puppet-type.yml b/org/alien4cloud/agentpuppet/agent-puppet-type.yml
@@ -2,7 +2,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.agentpuppet
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 description: Install agent Puppet on host compute

diff --git a/org/alien4cloud/alien4cloud/config/applications/types.yml b/org/alien4cloud/alien4cloud/config/applications/types.yml
@@ -2,12 +2,12 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.applications
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.config.csar:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.config.csar:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 relationship_types:

diff --git a/org/alien4cloud/alien4cloud/config/backupRestoreS3/types.yml b/org/alien4cloud/alien4cloud/config/backupRestoreS3/types.yml
@@ -2,12 +2,12 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.BackupRestoreS3
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.aws-cli.pub:2.2.0-SNAPSHOT
+  - org.alien4cloud.alien4cloud.pub:2.2.0
+  - org.alien4cloud.aws-cli.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 relationship_types:
@@ -96,12 +96,12 @@ node_types:
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.BackupRestoreS3
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.aws-cli.pub:2.2.0-SNAPSHOT
+  - org.alien4cloud.alien4cloud.pub:2.2.0
+  - org.alien4cloud.aws-cli.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 relationship_types:

diff --git a/org/alien4cloud/alien4cloud/config/csar/types.yml b/org/alien4cloud/alien4cloud/config/csar/types.yml
@@ -2,12 +2,12 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.csar
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/location/types.yml b/org/alien4cloud/alien4cloud/config/location/types.yml
@@ -2,13 +2,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.location
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.config.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.pub:2.2.0
+  - org.alien4cloud.alien4cloud.config.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/location_resources/autoconfig/types.yml b/org/alien4cloud/alien4cloud/config/location_resources/autoconfig/types.yml
@@ -2,13 +2,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.location_resources.autoconfig
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.config.location:2.2.0-SNAPSHOT
-  - org.alien4cloud.cloudify.hostpool.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.config.location:2.2.0
+  - org.alien4cloud.cloudify.hostpool.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/location_resources/cfy_byon/types.yml b/org/alien4cloud/alien4cloud/config/location_resources/cfy_byon/types.yml
@@ -2,14 +2,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.location_resources.cfy_byon
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.config.location:2.2.0-SNAPSHOT
-  - org.alien4cloud.cloudify.hostpool.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.cloudify.manager.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.config.location:2.2.0
+  - org.alien4cloud.cloudify.hostpool.pub:2.2.0
+  - org.alien4cloud.cloudify.manager.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:
@@ -40,7 +40,7 @@ node_types:
       resourceArchiveVersion:
         type: string
         required: true
-        default: 2.2.0-SNAPSHOT
+        default: 2.2.0
       resourceAgentInstallMethod:
         type: string
         required: true

diff --git a/org/alien4cloud/alien4cloud/config/location_resources/on_demand/types.yml b/org/alien4cloud/alien4cloud/config/location_resources/on_demand/types.yml
@@ -2,13 +2,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.location_resources.on_demand
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.config.location:2.2.0-SNAPSHOT
-  - org.alien4cloud.cloudify.hostpool.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.config.location:2.2.0
+  - org.alien4cloud.cloudify.hostpool.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/orchestrator/cfy/types.yml b/org/alien4cloud/alien4cloud/config/orchestrator/cfy/types.yml
@@ -2,13 +2,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.orchestrator.cfy
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.config.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.cloudify.manager.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.config.pub:2.2.0
+  - org.alien4cloud.cloudify.manager.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/orchestrator/conf_cfy_azure/types.yml b/org/alien4cloud/alien4cloud/config/orchestrator/conf_cfy_azure/types.yml
@@ -2,13 +2,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.orchestrator.conf_cfy_azure
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.config.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.config.orchestrator.cfy:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.config.pub:2.2.0
+  - org.alien4cloud.alien4cloud.config.orchestrator.cfy:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/plugin/types.yml b/org/alien4cloud/alien4cloud/config/plugin/types.yml
@@ -2,12 +2,12 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.plugin
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/pub/types.yml b/org/alien4cloud/alien4cloud/config/pub/types.yml
@@ -2,12 +2,12 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.pub
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
 
 node_types:

diff --git a/org/alien4cloud/alien4cloud/config/repository/types.yml b/org/alien4cloud/alien4cloud/config/repository/types.yml
@@ -2,13 +2,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.repository
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
+  - alien-base-types:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
+  - org.alien4cloud.alien4cloud.pub:2.2.0
 
 node_types:
   org.alien4cloud.alien4cloud.config.repository.nodes.ArtifactRepositoriesConfigurator:

diff --git a/org/alien4cloud/alien4cloud/config/service/types.yml b/org/alien4cloud/alien4cloud/config/service/types.yml
@@ -2,13 +2,13 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.config.repository
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
-  - alien-base-types:2.2.0-SM6
+  - alien-base-types:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
+  - org.alien4cloud.alien4cloud.pub:2.2.0
 
 node_types:
   org.alien4cloud.alien4cloud.config.repository.nodes.ArtifactRepositoriesConfigurator:

diff --git a/org/alien4cloud/alien4cloud/demo/types.yml b/org/alien4cloud/alien4cloud/demo/types.yml
@@ -2,16 +2,16 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.demo
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.jdk.linux:2.2.0-SNAPSHOT
-  - org.alien4cloud.elasticsearch.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.jmx.jolokia:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.webapp:2.2.0-SNAPSHOT
+  - org.alien4cloud.alien4cloud.pub:2.2.0
+  - org.alien4cloud.java.jdk.linux:2.2.0
+  - org.alien4cloud.elasticsearch.pub:2.2.0
+  - org.alien4cloud.java.jmx.jolokia:2.2.0
+  - org.alien4cloud.alien4cloud.webapp:2.2.0
 
 node_types:
   org.alien4cloud.alien4cloud.demo.nodes.Alien4CloudDemo:

diff --git a/org/alien4cloud/alien4cloud/postdeployment/types.yml b/org/alien4cloud/alien4cloud/postdeployment/types.yml
@@ -2,15 +2,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.postdeployment
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 description: Alien Post-Deployment application.
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.jdk.linux:2.2.0-SNAPSHOT
+  - org.alien4cloud.alien4cloud.pub:2.2.0
+  - org.alien4cloud.java.jdk.linux:2.2.0
 
 repositories:
   fastconnect_nexus:

diff --git a/org/alien4cloud/alien4cloud/pub/types.yml b/org/alien4cloud/alien4cloud/pub/types.yml
@@ -2,14 +2,14 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.pub
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - org.alien4cloud.java.jmx.jolokia:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.elasticsearch.pub:2.2.0-SNAPSHOT
+  - org.alien4cloud.java.jmx.jolokia:2.2.0
+  - org.alien4cloud.java.pub:2.2.0
+  - org.alien4cloud.elasticsearch.pub:2.2.0
 
 node_types:
   org.alien4cloud.alien4cloud.pub.nodes.Alien4CloudService:

diff --git a/org/alien4cloud/alien4cloud/tests/loadtest/jmeter/types.yml b/org/alien4cloud/alien4cloud/tests/loadtest/jmeter/types.yml
@@ -2,15 +2,15 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.tests.loadtest.jmeter
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 imports:
   - tosca-normative-types:1.0.0-ALIEN20
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.mock.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.mock.pub:2.2.0
+  - org.alien4cloud.java.pub:2.2.0
+  - org.alien4cloud.alien4cloud.pub:2.2.0
 
 description: >
   Mock types for A4C load tests.

diff --git a/org/alien4cloud/alien4cloud/topologies/a4c_aws_byon/types.yml b/org/alien4cloud/alien4cloud/topologies/a4c_aws_byon/types.yml
@@ -2,7 +2,7 @@ tosca_definitions_version: alien_dsl_2_0_0
 
 metadata:
   template_name: org.alien4cloud.alien4cloud.topologies.a4c_aws_byon
-  template_version: 2.2.0-SNAPSHOT
+  template_version: 2.2.0
   template_author: alien4cloud
 
 description: >
@@ -11,23 +11,23 @@ description: >
 
 
 imports:
-  - org.alien4cloud.alien4cloud.config.csar:2.2.0-SNAPSHOT
-  - org.alien4cloud.cloudify.manager.pub:2.2.0-SNAPSHOT
+  - org.alien4cloud.alien4cloud.config.csar:2.2.0
+  - org.alien4cloud.cloudify.manager.pub:2.2.0
   - tosca-normative-types:1.0.0-ALIEN20
-  - alien-base-types:2.2.0-SM6
-  - org.alien4cloud.alien4cloud.config.location:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.jmx.jolokia:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.webapp:2.2.0-SNAPSHOT
-  - org.alien4cloud.java.jdk.linux:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.config.location_resources.cfy_byon:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.config.orchestrator.cfy:2.2.0-SNAPSHOT
-  - org.alien4cloud.elasticsearch.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.config.location_resources.on_demand:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.config.repository:2.2.0-SNAPSHOT
-  - org.alien4cloud.cloudify.hostpool.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.pub:2.2.0-SNAPSHOT
-  - org.alien4cloud.alien4cloud.config.pub:2.2.0-SNAPSHOT
+  - alien-base-types:2.2.0
+  - org.alien4cloud.alien4cloud.config.location:2.2.0
+  - org.alien4cloud.java.pub:2.2.0
+  - org.alien4cloud.java.jmx.jolokia:2.2.0
+  - org.alien4cloud.alien4cloud.webapp:2.2.0
+  - org.alien4cloud.java.jdk.linux:2.2.0
+  - org.alien4cloud.alien4cloud.config.location_resources.cfy_byon:2.2.0
+  - org.alien4cloud.alien4cloud.config.orchestrator.cfy:2.2.0
+  - org.alien4cloud.elasticsearch.pub:2.2.0
+  - org.alien4cloud.alien4cloud.config.location_resources.on_demand:2.2.0
+  - org.alien4cloud.alien4cloud.config.repository:2.2.0
+  - org.alien4cloud.cloudify.hostpool.pub:2.2.0
+  - org.alien4cloud.alien4cloud.pub:2.2.0
+  - org.alien4cloud.alien4cloud.config.pub:2.2.0
 
 topology_template:
   inputs: