commit | cba86127a35a9e0351b975904a42dc008ddc8752 | [log] [tgz] |
---|---|---|
author | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri May 24 13:41:46 2019 +0300 |
committer | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri May 24 15:23:04 2019 +0300 |
tree | 0af07ba7177f298fcffe3cc2a063e95905eb716e | |
parent | 056ecbfe21ae469b2b34c37011c75375d4c01f2d [diff] |
Use 'system.foundation' image to bootstrap foundation node Change-Id: I584d0cf080f647806145d98e73461169c5331129
diff --git a/tcp_tests/templates/_heat_environments/eu-cloud.env b/tcp_tests/templates/_heat_environments/eu-cloud.env index 5b3b03b..e053283 100644 --- a/tcp_tests/templates/_heat_environments/eu-cloud.env +++ b/tcp_tests/templates/_heat_environments/eu-cloud.env
@@ -37,6 +37,8 @@ net_public: public + foundation_image: system.foundation + nameservers: 172.18.208.44 control_subnet_cidr: "10.6.0.0/24" tenant_subnet_cidr: "10.8.0.0/24"
diff --git a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml index 6923881..2530625 100644 --- a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml +++ b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
@@ -7,6 +7,8 @@ type: string instance_flavor: type: string + instance_image: + type: string instance_name: type: string instance_config_host: @@ -58,7 +60,7 @@ properties: image_update_policy: REBUILD flavor: { get_param: instance_flavor } - image: { list_join: ['', [ 'ubuntu-16.04-foundation-', { get_param: mcp_version } ]] } + image: { get_param: instance_image } key_name: { get_param: key_pair } name: list_join: