From 46d2b7ebe2bd64b92b6384d0bcfd98f86e1c8ba9 Mon Sep 17 00:00:00 2001 From: opensource-tnbt Date: Wed, 8 Jan 2020 21:13:10 +0530 Subject: Deploy Script: Pubnet deployment across all pods. Existing deploy.sh script configures public network only for pod17. Modified the script to configure for all pods. Renamed heat files in tools/files folder to include pod-name Signed-off-by: Sridhar K. N. Rao Change-Id: I2899a1b95052f39f015d8896dbb2400d73e13a97 --- tools/deploy.sh | 2 +- .../heat-public-net-deployment-intel-pod10.yaml | 70 ++++++++++++++++++++++ .../heat-public-net-deployment-intel-pod15.yaml | 70 ++++++++++++++++++++++ .../heat-public-net-deployment-intel-pod17.yaml | 70 ++++++++++++++++++++++ tools/files/heat-public-net-deployment-pod10.yaml | 70 ---------------------- tools/files/heat-public-net-deployment.yaml | 70 ---------------------- 6 files changed, 211 insertions(+), 141 deletions(-) create mode 100644 tools/files/heat-public-net-deployment-intel-pod10.yaml create mode 100644 tools/files/heat-public-net-deployment-intel-pod15.yaml create mode 100644 tools/files/heat-public-net-deployment-intel-pod17.yaml delete mode 100644 tools/files/heat-public-net-deployment-pod10.yaml delete mode 100644 tools/files/heat-public-net-deployment.yaml 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-intel-pod10.yaml b/tools/files/heat-public-net-deployment-intel-pod10.yaml new file mode 100644 index 0000000..1a35a5b --- /dev/null +++ b/tools/files/heat-public-net-deployment-intel-pod10.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.105.0/24 + + subnet_gateway: + type: string + default: 10.10.105.20 + + subnet_pool_start: + type: string + default: 10.10.105.29 + + subnet_pool_end: + type: string + default: 10.10.105.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-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-intel-pod17.yaml b/tools/files/heat-public-net-deployment-intel-pod17.yaml new file mode 100644 index 0000000..5ddfd90 --- /dev/null +++ b/tools/files/heat-public-net-deployment-intel-pod17.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.175.0/24 + + subnet_gateway: + type: string + default: 10.10.175.20 + + subnet_pool_start: + type: string + default: 10.10.175.29 + + subnet_pool_end: + type: string + default: 10.10.175.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-pod10.yaml b/tools/files/heat-public-net-deployment-pod10.yaml deleted file mode 100644 index 1a35a5b..0000000 --- a/tools/files/heat-public-net-deployment-pod10.yaml +++ /dev/null @@ -1,70 +0,0 @@ -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.105.0/24 - - subnet_gateway: - type: string - default: 10.10.105.20 - - subnet_pool_start: - type: string - default: 10.10.105.29 - - subnet_pool_end: - type: string - default: 10.10.105.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.yaml deleted file mode 100644 index 5ddfd90..0000000 --- a/tools/files/heat-public-net-deployment.yaml +++ /dev/null @@ -1,70 +0,0 @@ -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.175.0/24 - - subnet_gateway: - type: string - default: 10.10.175.20 - - subnet_pool_start: - type: string - default: 10.10.175.29 - - subnet_pool_end: - type: string - default: 10.10.175.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 - -- cgit 1.2.3-korg