Updated proper json for installers and version update for CF and TF

This commit is contained in:
brucec
2019-03-25 12:06:40 -07:00
parent c8e7ac7f3a
commit 550b78b18d
4 changed files with 8 additions and 7 deletions

View File

@@ -217,8 +217,7 @@ cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
"productId": "JFrogInstaller_Azure_SQL/1.0.0"
"features": [
{
"featureId": "Artifactory/${artifactoryVersion}",
"attributes": {}
"featureId": "Artifactory/${artifactoryVersion}"
}
}
EOF

View File

@@ -54,7 +54,7 @@
"ArtifactoryVersion": {
"Description": "Artifactory version to deploy",
"Type": "String",
"Default": "6.2.0"
"Default": "6.9.0"
},
"ArtifactoryLicense1": {
@@ -910,7 +910,6 @@
" \"features\": [\n",
" {\n",
" \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
" \"attributes\": {}\n",
" }\n",
"}\n"
]]},
@@ -1274,6 +1273,10 @@
"content" : { "Fn::Join" : ["", [
"{\n",
" \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n",
" \"features\": [\n",
" {\n",
" \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
" }\n",
"}\n"
]]},
"mode" : "000755",

View File

@@ -178,8 +178,7 @@ cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
"productId": "JFrog_TerraformInstaller_Mysql/1.0.0"
"features": [
{
"featureId": "Artifactory/${artifactory_version}",
"attributes": {}
"featureId": "Artifactory/${artifactory_version}"
}
}
EOF

View File

@@ -9,7 +9,7 @@ variable "key_name" {
variable "artifactory_version" {
description = "Artifactory version to deploy"
default = "6.2.0"
default = "6.9.0"
}
variable "artifactory_license_1" {