Rubbos heat template update

[bottlenecks.git] / utils / infra_setup / heat_template / bottlenecks_rubbos_hot.yaml

diff --git a/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml b/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml
index 8233356..5360044 100644 (file)
--- a/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml
+++ b/utils/infra_setup/heat_template/bottlenecks_rubbos_hot.yaml
@@ -81,6 +81,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_control_port }
+      admin_user: ubuntu
 
   rubbos_control_port:
     type: OS::Neutron::Port
@@ -88,6 +89,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_control_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -104,6 +106,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_httpd_port }
+      admin_user: ubuntu
 
   rubbos_httpd_port:
     type: OS::Neutron::Port
@@ -111,6 +114,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_mysql1:
     type: OS::Nova::Server
@@ -121,6 +125,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_mysql1_port }
+      admin_user: ubuntu
 
   rubbos_mysql1_port:
     type: OS::Neutron::Port
@@ -128,6 +133,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_tomcat1:
     type: OS::Nova::Server
@@ -138,6 +144,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_tomcat1_port }
+      admin_user: ubuntu
 
   rubbos_tomcat1_port:
     type: OS::Neutron::Port
@@ -145,6 +152,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_client1:
     type: OS::Nova::Server
@@ -155,6 +163,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client1_port }
+      admin_user: ubuntu
 
   rubbos_client1_port:
     type: OS::Neutron::Port
@@ -162,6 +171,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_client2:
     type: OS::Nova::Server
@@ -172,6 +182,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client2_port }
+      admin_user: ubuntu
 
   rubbos_client2_port:
     type: OS::Neutron::Port
@@ -179,6 +190,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_client3:
     type: OS::Nova::Server
@@ -189,6 +201,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client3_port }
+      admin_user: ubuntu
 
   rubbos_client3_port:
     type: OS::Neutron::Port
@@ -196,6 +209,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_client4:
     type: OS::Nova::Server
@@ -206,6 +220,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_client4_port }
+      admin_user: ubuntu
 
   rubbos_client4_port:
     type: OS::Neutron::Port
@@ -213,6 +228,7 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
 
   rubbos_benchmark:
     type: OS::Nova::Server
@@ -223,6 +239,7 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: rubbos_benchmark_port }
+      admin_user: ubuntu
 
   rubbos_benchmark_port:
     type: OS::Neutron::Port
@@ -230,6 +247,24 @@ resources:
       network_id: { get_resource: private_net }
       fixed_ips:
         - subnet_id: { get_resource: private_subnet }
+      security_groups: [{ get_resource: server_security_group }]
+
+  server_security_group:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      description: Rubbos group for servers access.
+      name: rubbos-security-group
+      rules: [
+        {remote_ip_prefix: 0.0.0.0/0,
+        protocol: tcp,
+        port_range_min: 1,
+        port_range_max: 65535},
+        {remote_ip_prefix: 0.0.0.0/0,
+        protocol: udp,
+        port_range_min: 1,
+        port_range_max: 65535},
+        {remote_ip_prefix: 0.0.0.0/0,
+        protocol: icmp}]
 
 outputs:
   rubbos_control_private_ip: