Allow to pass custom vsrx image
Related-Prod: PRODX-11488
Change-Id: I3884a8cd3cd4129d7e74a5d425fffc958ce6020b
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vsrx1.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vsrx1.yaml
index 8871fa3..ff23173 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vsrx1.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vsrx1.yaml
@@ -11,6 +11,7 @@
parameters:
image: bionic-server-cloudimg-amd64-20190612
public_net_id: public
+ vsrx_image: mos-vsrx-3nets
masters_size: 0
worker_size: 3
cmp_size: 2
diff --git a/de/heat-templates/fragments/NetworkPrvFl.yaml b/de/heat-templates/fragments/NetworkPrvFl.yaml
index f122682..5519508 100644
--- a/de/heat-templates/fragments/NetworkPrvFl.yaml
+++ b/de/heat-templates/fragments/NetworkPrvFl.yaml
@@ -20,6 +20,12 @@
type: string
tun_network:
type: string
+ vsrx_image:
+ type: string
+ default: vsrx-mcp2-tf-3-nets
+ vsrx_flavor:
+ type: string
+ default: oc_vsrx
resources:
diff --git a/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml b/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml
index 847a256..7bf6781 100644
--- a/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml
+++ b/de/heat-templates/fragments/NetworkPrvFlVSRX.yaml
@@ -17,6 +17,12 @@
type: string
tun_network:
type: string
+ vsrx_image:
+ type: string
+ default: vsrx-mcp2-tf-3-nets
+ vsrx_flavor:
+ type: string
+ default: oc_vsrx
resources:
@@ -62,8 +68,8 @@
properties:
name: { list_join: ['-', [get_param: "OS::stack_name", 'vsrx01']] }
availability_zone: nova
- image: vsrx-mcp2-tf-3-nets
- flavor: oc_vsrx
+ image: { get_param: vsrx_image }
+ flavor: { get_param: vsrx_flavor }
networks:
- port: { get_resource: accessible_server_port }
- port: { get_resource: private_floating_server_port }
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 757f689..7864c06 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -272,6 +272,12 @@
description: If set true then AIO is going to be deployed.
type: string
default: 'false'
+ vsrx_image:
+ type: string
+ default: vsrx-mcp2-tf-3-nets
+ vsrx_flavor:
+ type: string
+ default: oc_vsrx
conditions:
aio_deploy:
@@ -316,6 +322,8 @@
accessible_network: { get_attr: [accessible_network, public_network]}
data_network_vsrx_ip: { get_param: data_network_vsrx_ip }
tun_network: { get_attr: [tun_network, tun_network_id] }
+ vsrx_image: { get_param: vsrx_image }
+ vsrx_flavor: { get_param: vsrx_flavor }
storage_network:
type: MCP2::NetworkAccStorage