skuska

Openstack/pv176_env.yaml

+
 resource_registry:
   Lib::single_vm: https://gitlab.ics.muni.cz/396462/PV176/raw/master/Openstack/pv176_vm.yaml
   Lib::private_network: https://gitlab.ics.muni.cz/396462/PV176/raw/master/Openstack/pv176_network.yaml
\ No newline at end of file

Openstack/pv176_network.yaml

@@ -4,52 +4,4 @@ resources:
   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:
-    description: Private network info.
-    value: { get_attr: [internal_net] }
-  private_subnet:
-    description: Private network info.
-    value: { get_attr: [internal_subnet] }  
-  sec_group:
-    description: security 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
+        name: PV176-private-network
\ No newline at end of file

Openstack/pv176_student_server_group.yaml

@@ -22,7 +22,7 @@ resources:
 
     network:
       type: Lib::private_network
-
+         
     tiny_cluster:
       type: OS::Heat::ResourceGroup
       properties:
@@ -30,5 +30,5 @@ resources:
         resource_def:
           type: Lib::single_vm
           properties:
-            network: { get_attr: [ private_network, private_subnet, network_id ] }  
-            
+            network: { get_attr: [ network, private_subnet, network_id ] }  
+