summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/deploy.sh2
-rw-r--r--tools/files/heat-public-net-deployment-intel-pod10.yaml (renamed from tools/files/heat-public-net-deployment-pod10.yaml)0
-rw-r--r--tools/files/heat-public-net-deployment-intel-pod15.yaml70
-rw-r--r--tools/files/heat-public-net-deployment-intel-pod17.yaml (renamed from tools/files/heat-public-net-deployment.yaml)0
4 files changed, 71 insertions, 1 deletions
diff --git a/tools/deploy.sh b/tools/deploy.sh
index a65cb6b..3d636fb 100755
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -149,7 +149,7 @@ site_action() {
create_public_network() {
export OS_AUTH_URL=${OS_AUTH_URL_IDENTITY}
sudo -E treasuremap/tools/openstack stack create --wait \
- -t /target/airship/tools/files/heat-public-net-deployment.yaml \
+ -t /target/airship/tools/files/heat-public-net-deployment-$SITE_NAME.yaml \
public-network
}
diff --git a/tools/files/heat-public-net-deployment-pod10.yaml b/tools/files/heat-public-net-deployment-intel-pod10.yaml
index 1a35a5b..1a35a5b 100644
--- a/tools/files/heat-public-net-deployment-pod10.yaml
+++ b/tools/files/heat-public-net-deployment-intel-pod10.yaml
diff --git a/tools/files/heat-public-net-deployment-intel-pod15.yaml b/tools/files/heat-public-net-deployment-intel-pod15.yaml
new file mode 100644
index 0000000..1a0d090
--- /dev/null
+++ b/tools/files/heat-public-net-deployment-intel-pod15.yaml
@@ -0,0 +1,70 @@
+heat_template_version: ocata
+
+parameters:
+ network_name:
+ type: string
+ default: public
+
+ physical_network_name:
+ type: string
+ default: public
+
+ physical_network_interface:
+ type: string
+ default: external
+
+ subnet_name:
+ type: string
+ default: public
+
+ subnet_cidr:
+ type: string
+ default: 10.10.155.0/24
+
+ subnet_gateway:
+ type: string
+ default: 10.10.155.20
+
+ subnet_pool_start:
+ type: string
+ default: 10.10.155.29
+
+ subnet_pool_end:
+ type: string
+ default: 10.10.155.99
+
+resources:
+ public_net:
+ type: OS::Neutron::ProviderNet
+ properties:
+ admin_state_up: true
+ name:
+ get_param: network_name
+ network_type: flat
+ physical_network:
+ get_param: physical_network_interface
+ port_security_enabled: true
+ router_external: true
+ shared: true
+
+ private_subnet:
+ type: OS::Neutron::Subnet
+ properties:
+ name:
+ get_param: subnet_name
+ network:
+ get_resource: public_net
+ cidr:
+ get_param: subnet_cidr
+ gateway_ip:
+ get_param: subnet_gateway
+ enable_dhcp: true
+ allocation_pools:
+ - start:
+ get_param: subnet_pool_start
+ end:
+ get_param: subnet_pool_end
+ dns_nameservers:
+ - 8.8.8.8
+ - 8.8.4.4
+
diff --git a/tools/files/heat-public-net-deployment.yaml b/tools/files/heat-public-net-deployment-intel-pod17.yaml
index 5ddfd90..5ddfd90 100644
--- a/tools/files/heat-public-net-deployment.yaml
+++ b/tools/files/heat-public-net-deployment-intel-pod17.yaml