From 689c7fb9523714a9d16ece237fd258d25f93c8d3 Mon Sep 17 00:00:00 2001 From: Laurent Ganne Date: Tue, 11 Dec 2018 18:08:31 +0000 Subject: [PATCH 1/5] Using NFS server private address in NFS client --- .../resources/topology/tosca_types.zip | Bin 1013922 -> 1013925 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/commands/bootstrap/resources/topology/tosca_types.zip b/commands/bootstrap/resources/topology/tosca_types.zip index 64c3cfb15902c18d46cb467ea9364eb9dbb467ca..4f44b4adb0122fa90f601cb91e3cfa3b46bea21d 100644 GIT binary patch delta 2524 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 Uzpy6WU=9+0&IaqRv!qV{02g(X-2eap From e25d3a9ad514c2f94decdd7c2efdd747af8a06d9 Mon Sep 17 00:00:00 2001 From: Laurent Ganne Date: Wed, 12 Dec 2018 17:53:12 +0000 Subject: [PATCH 2/5] Getting A4C default version to bootstrap from versions.yaml --- Makefile | 2 + commands/bootstrap/bootstrap.go | 2 +- commands/bootstrap/resources.go | 20 ++++++-- .../resources/topology/topology_ha.tmpl | 50 +++++++++---------- .../topology/topology_single_node.tmpl | 44 ++++++++-------- commands/bootstrap/topology.go | 14 +++--- config/config.go | 2 +- 7 files changed, 76 insertions(+), 58 deletions(-) diff --git a/Makefile b/Makefile index 4d4b6dce7..809c09d96 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ VERSION:=$(if $(BUILD_TAG),$(VERSION)+$(BUILD_TAG),$(VERSION)) COMMIT_HASH=$(shell git rev-parse HEAD) ANSIBLE_VERSION=$(shell grep "ansible_version" versions.yaml | awk '{print $$2}') CONSUL_VERSION=$(shell grep "consul_version" versions.yaml | awk '{print $$2}') +ALIEN4CLOUD_VERSION=$(shell grep "alien4cloud_version" versions.yaml | awk '{print $$2}') TERRAFORM_VERSION=$(shell grep "terraform_version" versions.yaml | awk '{print $$2}') TF_CONSUL_PLUGIN_VERSION=$(shell grep "tf_consul_plugin_version" versions.yaml | awk '{print $$2}') TF_AWS_PLUGIN_VERSION=$(shell grep "tf_aws_plugin_version" versions.yaml | awk '{print $$2}') @@ -40,6 +41,7 @@ build: test -X github.com/ystia/yorc/commands.TfGooglePluginVersion=$(TF_GOOGLE_PLUGIN_VERSION) \ -X github.com/ystia/yorc/commands/bootstrap.ansibleVersion=$(ANSIBLE_VERSION) \ -X github.com/ystia/yorc/commands/bootstrap.consulVersion=$(CONSUL_VERSION) \ + -X github.com/ystia/yorc/commands/bootstrap.alien4cloudVersion=$(ALIEN4CLOUD_VERSION) \ -X github.com/ystia/yorc/commands/bootstrap.terraformVersion=$(TERRAFORM_VERSION) \ -X github.com/ystia/yorc/commands/bootstrap.yorcVersion=$(YORC_VERSION)" @rm -f ./build/bootstrapResources.zip diff --git a/commands/bootstrap/bootstrap.go b/commands/bootstrap/bootstrap.go index 8b26e5089..58feeff9c 100644 --- a/commands/bootstrap/bootstrap.go +++ b/commands/bootstrap/bootstrap.go @@ -28,7 +28,7 @@ import ( // Variables with an uknown values are initialized in the root Makefile var ( - alien4cloudVersion = getAlien4CloudVersionFromTOSCATypes() + alien4cloudVersion = "unknown" ansibleVersion = "unknown" consulVersion = "unknown" terraformVersion = "unknown" diff --git a/commands/bootstrap/resources.go b/commands/bootstrap/resources.go index 5e7150f8b..ec1cfde7b 100644 --- a/commands/bootstrap/resources.go +++ b/commands/bootstrap/resources.go @@ -106,9 +106,23 @@ func extractResources(resourcesZipFilePath, resourcesDir string) error { return nil } -// getAlien4CloudDefaultVersion returns the ALien4Cloud version from the bundled -// resources zip file containing TOSCA types needed for the bootstrap +// getAlien4CloudVersionFromTOSCATypes returns the ALien4Cloud version from the +// bundled resources zip file containing TOSCA types needed for the bootstrap func getAlien4CloudVersionFromTOSCATypes() string { + + return getVersionFromTOSCATypes("alien-base-types") +} + +// getForgeDefaultVersion returns the Forge version from the bundled +// resources zip file containing TOSCA types needed for the bootstrap +func getForgeVersionFromTOSCATypes() string { + + return getVersionFromTOSCATypes("org.ystia.yorc.pub") +} + +// getVersionFromTOSCATypes returns the version from the bundled +// resources zip file containing TOSCA types needed for the bootstrap +func getVersionFromTOSCATypes(path string) string { // Use the embedded resources version := "unknown" exePath, err := resources.ExecutablePath() @@ -130,7 +144,7 @@ func getAlien4CloudVersionFromTOSCATypes() string { return version } - re := regexp.MustCompile(`alien-base-types/([0-9a-zA-Z.-]+)/`) + re := regexp.MustCompile(path + "/" + `([0-9a-zA-Z.-]+)/`) for _, resource := range allResources { if !strings.HasSuffix(resource.Path(), "tosca_types.zip") { continue diff --git a/commands/bootstrap/resources/topology/topology_ha.tmpl b/commands/bootstrap/resources/topology/topology_ha.tmpl index 178857e56..3d84caa21 100644 --- a/commands/bootstrap/resources/topology/topology_ha.tmpl +++ b/commands/bootstrap/resources/topology/topology_ha.tmpl @@ -8,37 +8,37 @@ metadata: description: "" imports: - - alien-base-types/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/alien-base-types.yml - - org.ystia.nfs.linux.ansible/2.1.0-SNAPSHOT/types.yaml + - alien-base-types/{{getAlien4CloudVersionFromTOSCATypes}}/alien-base-types.yml + - org.ystia.nfs.linux.ansible/{{getForgeVersionFromTOSCATypes}}/types.yaml - - - org.alien4cloud.alien4cloud.config.location/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml + - org.alien4cloud.alien4cloud.config.location/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml - - - - - - org.ystia.yorc.experimental.consul.linux.ansible/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.elasticsearch.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.terraform.linux.terraform/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.java.jmx.jolokia/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.consul.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.linux.ansible/2.1.0-SNAPSHOT/types.yaml - - org.ystia.nfs.pub/2.1.0-SNAPSHOT/types.yaml + - org.ystia.yorc.experimental.consul.linux.ansible/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.elasticsearch.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.terraform.linux.terraform/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.java.jmx.jolokia/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.consul.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.linux.ansible/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.ystia.nfs.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml - - - org.alien4cloud.java.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.pub/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.alien4cloud.config.location_resources.on_demand/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.alien4cloud.config.location_resources.autoconfig/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.experimental.consul.pub/2.1.0-SNAPSHOT/types.yaml - - org.ystia.ansible.linux.ansible/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.alien4cloud.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.alien4cloud.webapp/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.alien4cloud/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.java.jdk.linux/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.alien4cloud.config.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.cloudify.hostpool.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - alien-extended-storage-types/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/alien-extended-storage-types.yml - - org.ystia.terraform.pub/2.1.0-SNAPSHOT/types.yaml - - org.ystia.ansible.pub/2.1.0-SNAPSHOT/types.yaml + - org.alien4cloud.java.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.alien4cloud.config.location_resources.on_demand/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.alien4cloud.config.location_resources.autoconfig/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.experimental.consul.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.ystia.ansible.linux.ansible/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.alien4cloud.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.alien4cloud.webapp/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.alien4cloud/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.java.jdk.linux/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.alien4cloud.config.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.cloudify.hostpool.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - alien-extended-storage-types/{{getAlien4CloudVersionFromTOSCATypes}}/alien-extended-storage-types.yml + - org.ystia.terraform.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.ystia.ansible.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml topology_template: node_templates: diff --git a/commands/bootstrap/resources/topology/topology_single_node.tmpl b/commands/bootstrap/resources/topology/topology_single_node.tmpl index bd32951f1..81daa552e 100644 --- a/commands/bootstrap/resources/topology/topology_single_node.tmpl +++ b/commands/bootstrap/resources/topology/topology_single_node.tmpl @@ -8,34 +8,34 @@ metadata: description: "" imports: - - alien-base-types/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/alien-base-types.yml + - alien-base-types/{{getAlien4CloudVersionFromTOSCATypes}}/alien-base-types.yml - - - org.alien4cloud.alien4cloud.config.location/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml + - org.alien4cloud.alien4cloud.config.location/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml - - - - - - org.ystia.yorc.experimental.consul.linux.ansible/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.elasticsearch.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.terraform.linux.terraform/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.java.jmx.jolokia/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.consul.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.linux.ansible/2.1.0-SNAPSHOT/types.yaml + - org.ystia.yorc.experimental.consul.linux.ansible/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.elasticsearch.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.terraform.linux.terraform/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.java.jmx.jolokia/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.consul.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.linux.ansible/{{getForgeVersionFromTOSCATypes}}/types.yaml - - - org.alien4cloud.java.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.pub/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.alien4cloud.config.location_resources.on_demand/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.alien4cloud.config.location_resources.autoconfig/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.experimental.consul.pub/2.1.0-SNAPSHOT/types.yaml - - org.ystia.ansible.linux.ansible/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.alien4cloud.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.alien4cloud.webapp/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.yorc.alien4cloud/2.1.0-SNAPSHOT/types.yaml - - org.alien4cloud.java.jdk.linux/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.alien4cloud.config.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.alien4cloud.cloudify.hostpool.pub/{{getAlien4CloudVersion .Alien4cloud.DownloadURL}}/types.yml - - org.ystia.terraform.pub/2.1.0-SNAPSHOT/types.yaml - - org.ystia.ansible.pub/2.1.0-SNAPSHOT/types.yaml + - org.alien4cloud.java.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.alien4cloud.config.location_resources.on_demand/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.alien4cloud.config.location_resources.autoconfig/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.experimental.consul.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.ystia.ansible.linux.ansible/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.alien4cloud.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.alien4cloud.webapp/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.yorc.alien4cloud/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.alien4cloud.java.jdk.linux/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.alien4cloud.config.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.alien4cloud.cloudify.hostpool.pub/{{getAlien4CloudVersionFromTOSCATypes}}/types.yml + - org.ystia.terraform.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml + - org.ystia.ansible.pub/{{getForgeVersionFromTOSCATypes}}/types.yaml topology_template: node_templates: diff --git a/commands/bootstrap/topology.go b/commands/bootstrap/topology.go index 91487e335..63b5d9be2 100644 --- a/commands/bootstrap/topology.go +++ b/commands/bootstrap/topology.go @@ -281,12 +281,14 @@ func createFileFromTemplates(templateFileNames []string, templateName, resultFil // Mapping from names to functions of functions referenced in templates fmap := template.FuncMap{ - "formatAsYAML": formatAsYAML, - "formatOnDemandResourceCredsAsYAML": formatOnDemandResourceCredsAsYAML, - "indent": indent, - "getFile": getFile, - "getRepositoryURL": getRepositoryURL, - "getAlien4CloudVersion": getAlien4CloudVersion, + "formatAsYAML": formatAsYAML, + "formatOnDemandResourceCredsAsYAML": formatOnDemandResourceCredsAsYAML, + "indent": indent, + "getFile": getFile, + "getRepositoryURL": getRepositoryURL, + "getAlien4CloudVersion": getAlien4CloudVersion, + "getAlien4CloudVersionFromTOSCATypes": getAlien4CloudVersionFromTOSCATypes, + "getForgeVersionFromTOSCATypes": getForgeVersionFromTOSCATypes, } parsedTemplate, err := template.New(templateName).Funcs(fmap).ParseFiles(templateFileNames...) diff --git a/config/config.go b/config/config.go index f218b8923..c7da25c86 100644 --- a/config/config.go +++ b/config/config.go @@ -83,7 +83,7 @@ type Configuration struct { WfStepGracefulTerminationTimeout time.Duration `yaml:"wf_step_graceful_termination_timeout,omitempty" mapstructure:"wf_step_graceful_termination_timeout"` ServerID string `yaml:"server_id,omitempty" mapstructure:"server_id"` Terraform Terraform `yaml:"terraform,omitempty" mapstructure:"terraform"` - DisableSSHAgent bool `yaml:"disable_ssh_agent,omitempty"" mapstructure:"disable_ssh_agent"` + DisableSSHAgent bool `yaml:"disable_ssh_agent,omitempty" mapstructure:"disable_ssh_agent"` } // DockerSandbox holds the configuration for a docker sandbox From 11edcd323d73038e3a11ac91ecf23f5cb5ea66ae Mon Sep 17 00:00:00 2001 From: Laurent Ganne Date: Wed, 12 Dec 2018 17:54:43 +0000 Subject: [PATCH 3/5] Getting A4C default version to bootstrap from versions.yaml --- versions.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/versions.yaml b/versions.yaml index f8d4c288a..d1199c8a9 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,4 +1,6 @@ yorc_version: 3.1.0-SNAPSHOT +# Alien4Cloud version used by the bootstrap as the default version to download/install +alien4cloud_version: 2.1.0-RC1 consul_version: 1.2.3 terraform_version: 0.11.8 ansible_version: 2.7.2 From 46ad0cd5db816ec5522972ad8d236ae5cc612b86 Mon Sep 17 00:00:00 2001 From: Laurent Ganne <33217305+laurentganne@users.noreply.github.com> Date: Thu, 13 Dec 2018 10:49:56 +0100 Subject: [PATCH 4/5] Updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6fec3418..71ea7cdc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## UNRELEASED +### BUG FIXES + +* Bootstrap of HA setup fails on GCP, at step configuring the NFS Client component (GH-218) + ## 3.1.0-M7 (December 07, 2018) ### DEPENDENCIES From f2c6b0beada8649c527acf6fd7bb8bdd8c468f27 Mon Sep 17 00:00:00 2001 From: Laurent Ganne <33217305+laurentganne@users.noreply.github.com> Date: Thu, 13 Dec 2018 10:51:06 +0100 Subject: [PATCH 5/5] Fixed link to issue --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71ea7cdc6..479ce69b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### BUG FIXES -* Bootstrap of HA setup fails on GCP, at step configuring the NFS Client component (GH-218) +* Bootstrap of HA setup fails on GCP, at step configuring the NFS Client component [GH-218](https://github.com/ystia/yorc/issues/218)) ## 3.1.0-M7 (December 07, 2018)