From 92790ee2cc952422d3c19b0b842abfafa280edaa Mon Sep 17 00:00:00 2001
From: Martin Cuchran <cuchy@Martins-MacBook-Pro-4.local>
Date: Mon, 6 Feb 2017 16:12:40 +0100
Subject: [PATCH] Removed cluster
---
Openstack/pv176_network.yaml | 54 ++++++++++++++++++++---
Openstack/pv176_student_server_group.yaml | 11 +----
2 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/Openstack/pv176_network.yaml b/Openstack/pv176_network.yaml
index e1c6ac0..6f07d40 100644
--- a/Openstack/pv176_network.yaml
+++ b/Openstack/pv176_network.yaml
@@ -1,10 +1,52 @@
heat_template_version: '2016-04-08'
resources:
- internal_net:
- type: OS::Neutron::Net
- properties:
- name: PV176-network
+ internal_net:
+ type: OS::Neutron::Net
+ properties:
+ name: PV176-private-network
+ internal_subnet:
+ type: OS::Neutron::Subnet
+ properties:
+ network_id: { get_resource: internal_net }
+ cidr: "10.0.0.0/8"
+ dns_nameservers: [ "147.251.4.3", "8.8.8.8" ]
+ ip_version: 4
+ enable_dhcp: false
+ name: PV176-private-subnet
+ internal_router:
+ type: OS::Neutron::Router
+ properties:
+ external_gateway_info: { network: public-float-21 }
+ name: PV176-router
+ internal_interface:
+ type: OS::Neutron::RouterInterface
+ properties:
+ router_id: { get_resource: internal_router }
+ subnet: { get_resource: internal_subnet }
+ full_access_secgroup:
+ type: OS::Neutron::SecurityGroup
+ properties:
+ name: PV176-security-group-MUNI
+ rules:
+ - protocol: tcp
+ remote_ip_prefix: 147.251.0.0/16
+ port_range_min: 1
+ port_range_max: 65000
+ - protocol: tcp
+ remote_ip_prefix: 10.0.0.0/8
+ port_range_min: 1
+ port_range_max: 65000
+
+
outputs:
- private_network:
- value: { get_attr: [internal_net] }
\ No newline at end of file
+ private_network:
+ value: { get_attr: [internal_net] }
+ private_subnet:
+ value: { get_attr: [internal_subnet] }
+ sec_group:
+ value: { get_attr: [full_access_secgroup] }
+ private_router:
+ value: { get_attr: [internal_router]}
+ private_interface:
+ value: { get_attr: [internal_interface]}
\ No newline at end of file
diff --git a/Openstack/pv176_student_server_group.yaml b/Openstack/pv176_student_server_group.yaml
index edc503f..9029ee0 100644
--- a/Openstack/pv176_student_server_group.yaml
+++ b/Openstack/pv176_student_server_group.yaml
@@ -22,13 +22,6 @@ resources:
network:
type: Lib::private_network
-
- tiny_cluster:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: cluster_size }
- resource_def:
- type: Lib::single_vm
- properties:
- network: { get_attr: [ network, private_subnet, network_id ] }
+
+
--
GitLab