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:
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
index deb6158..87f7563 100644
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
@@ -50,6 +50,9 @@
net_public:
type: string
+ foundation_image:
+ type: string
+
resources:
networks:
type: MCP::Networks
@@ -347,6 +350,7 @@
mcp_version: { get_param: mcp_version }
instance_domain: {get_param: instance_domain}
instance_name: foundation
+ instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
network: { get_attr: [networks, network] }
underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
index ab909a5..d95fb24 100644
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
@@ -56,6 +56,9 @@
net_public:
type: string
+ foundation_image:
+ type: string
+
resources:
networks:
type: MCP::Networks
@@ -400,6 +403,7 @@
mcp_version: { get_param: mcp_version }
instance_domain: {get_param: instance_domain}
instance_name: foundation
+ instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
network: { get_attr: [networks, network] }
underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
index a3a1152..9ae8f08 100644
--- a/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
@@ -50,6 +50,9 @@
net_public:
type: string
+ foundation_image:
+ type: string
+
resources:
networks:
type: MCP::Networks
@@ -266,6 +269,7 @@
mcp_version: { get_param: mcp_version }
instance_domain: {get_param: instance_domain}
instance_name: foundation
+ instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
network: { get_attr: [networks, network] }
underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
index d9a8971..9b97f23 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
@@ -65,6 +65,9 @@
net_public:
type: string
+ foundation_image:
+ type: string
+
resources:
networks:
type: MCP::Networks
@@ -500,6 +503,7 @@
mcp_version: { get_param: mcp_version }
instance_domain: {get_param: instance_domain}
instance_name: foundation
+ instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
network: { get_attr: [networks, network] }
underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
index 3de043a..b3b1dbc 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
@@ -68,6 +68,9 @@
net_public:
type: string
+ foundation_image:
+ type: string
+
resources:
networks:
type: MCP::Networks
@@ -386,6 +389,7 @@
mcp_version: { get_param: mcp_version }
instance_domain: {get_param: instance_domain}
instance_name: foundation
+ instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
network: { get_attr: [networks, network] }
underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
index b2a97e1..d1a13f9 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
@@ -68,6 +68,9 @@
net_public:
type: string
+ foundation_image:
+ type: string
+
resources:
networks:
type: MCP::Networks
@@ -386,6 +389,7 @@
mcp_version: { get_param: mcp_version }
instance_domain: {get_param: instance_domain}
instance_name: foundation
+ instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
network: { get_attr: [networks, network] }
underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }