diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-05-09 18:52:42 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-05-09 18:52:42 +0000 |
| commit | 2d840c90d0b3f9d355b6d08b537d132fbff50458 (patch) | |
| tree | 9a9b4911f3877b0ddbc68383bef7bd741cbb1cb3 | |
| parent | d071f250dd5def7a4279f54766933b7189e38eed (diff) | |
[DCAE-7] handle parameterized images/flavors
Change-Id: I9a95938c276d3cce7d50d20a10ba2505964df013
Signed-off-by: Carsten Lund <lund@research.att.com>
| -rw-r--r-- | dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy index c007a68..6277ab7 100644 --- a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy +++ b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy @@ -230,7 +230,7 @@ class GenControllerConfiguration extends DocUtils { return } def n1 = n.replace("vm-", "dcae-") - save("/openstack/vmTypes/$n1",platformConfig.genVmType(n)) + save("/openstack/vmTypes/$n1",substitute(platformConfig.genVmType(n),[:],n,null)) } def chef = file2object("$release-$env/chef.yaml", false) def maven = file2object("$release-$env/maven.yaml", false) @@ -398,7 +398,7 @@ class GenControllerConfiguration extends DocUtils { m.chefUser = (envMap['chef'] ?: [:])['user'] ?: "TBD - env.yaml@chef.user" m.chefOrg = (envMap['chef'] ?: [:])['org'] ?: "TBD - env.yaml@chef.group" m.chefTopology = "$release-$env" - m.openstackFlavor = platformConfig.flavor(s,i) + m.openstackFlavor = substitute(platformConfig.flavor(s,i),[:],s,i) if ((vmTemplate['dns-arecords'] ?: []).contains('site')) { platformConfig.init(s,i) m.serviceFqdn = platformConfig.siteServiceFqdn() |