From a3bfc5e8b360f53473218fb335c80b2ef1f2e9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 1 Feb 2017 13:33:23 +0100 Subject: [PATCH] rancher_stack: Only read compose when catalog_id is empty (#11593) --- builtin/providers/rancher/resource_rancher_stack.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/providers/rancher/resource_rancher_stack.go b/builtin/providers/rancher/resource_rancher_stack.go index d9d76e8ae..028b4f2b5 100644 --- a/builtin/providers/rancher/resource_rancher_stack.go +++ b/builtin/providers/rancher/resource_rancher_stack.go @@ -155,8 +155,12 @@ func resourceRancherStackRead(d *schema.ResourceData, meta interface{}) error { d.Set("name", stack.Name) dockerCompose := strings.Replace(config.DockerComposeConfig, "\r", "", -1) rancherCompose := strings.Replace(config.RancherComposeConfig, "\r", "", -1) - d.Set("docker_compose", dockerCompose) - d.Set("rancher_compose", rancherCompose) + + catalogId := d.Get("catalog_id") + if catalogId == "" { + d.Set("docker_compose", dockerCompose) + d.Set("rancher_compose", rancherCompose) + } d.Set("rendered_docker_compose", dockerCompose) d.Set("rendered_rancher_compose", rancherCompose) d.Set("environment_id", stack.AccountId)