Merge branch 'master' into 'master'

Carlos Ramos is adding nginx and apache services

See merge request dehury/radon-particles!6

servicetemplates/radon.blueprints.examples/myApacheService_ramos/README.md

+Lab 07 - Homework
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myApacheService_ramos/README.md.mimetype

+text/plain
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myApacheService_ramos/ServiceTemplate.tosca

+tosca_definitions_version: tosca_simple_yaml_1_3
+
+metadata:
+  targetNamespace: "radon.blueprints.examples"
+topology_template:
+  node_templates:
+    containerNginx_0:
+      type: radon.nodes.docker.containerNginx
+      metadata:
+        x: "1156"
+        y: "263"
+        displayName: "defaultApacheServer_ramos"
+      properties:
+        container_port: "80"
+        image_name: "httpd:2.4"
+        container_name: "myapacheserver"
+        host_port: "8081"
+        name: "defaultApacheServer_ramos"
+      requirements:
+        - host:
+            node: DockerEngineUT_0
+            relationship: con_HostedOn_1
+            capability: host
+    RemoteWorkstation_0:
+      type: radon.nodes.VM.RemoteWorkstation
+      metadata:
+        x: "369"
+        y: "311"
+        displayName: "myWorkerVM_ramos"
+      properties:
+        ssh_username: "centos"
+        KeyFile: "/home/ubuntu/.ssh/id_rsa"
+        external_ip: "172.17.89.55"
+    DockerEngineUT_0:
+      type: radon.nodes.docker.DockerEngineUT
+      metadata:
+        x: "685"
+        y: "320"
+        displayName: "DockerEngineUT"
+      requirements:
+        - host:
+            node: RemoteWorkstation_0
+            relationship: con_HostedOn_0
+            capability: host
+  relationship_templates:
+    con_HostedOn_0:
+      type: tosca.relationships.HostedOn
+    con_HostedOn_1:
+      type: tosca.relationships.HostedOn

servicetemplates/radon.blueprints.examples/myfirstToscaApp_ramos/README.md

+Lab 07 - Ramos
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myfirstToscaApp_ramos/README.md.mimetype

+text/plain
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myfirstToscaApp_ramos/ServiceTemplate.tosca

+tosca_definitions_version: tosca_simple_yaml_1_3
+
+metadata:
+  targetNamespace: "radon.blueprints.examples"
+topology_template:
+  node_templates:
+    containerNginx_0:
+      type: radon.nodes.docker.containerNginx
+      metadata:
+        x: "1472"
+        y: "65"
+        displayName: "defaultNginxServer_ramos"
+      properties:
+        container_port: "80"
+        image_name: "nginx:1.13"
+        container_name: "mynginxserver"
+        host_port: "8082"
+        name: "defaultNginxServer_ramos"
+      requirements:
+        - host:
+            node: DockerEngineUT_0
+            relationship: con_HostedOn_1
+            capability: host
+    RemoteWorkstation_0:
+      type: radon.nodes.VM.RemoteWorkstation
+      metadata:
+        x: "617"
+        y: "353"
+        displayName: "myWorkerVM_ramos"
+      properties:
+        ssh_username: "centos"
+        KeyFile: "/home/ubuntu/.ssh/id_rsa"
+        external_ip: "172.17.89.55"
+    DockerEngineUT_0:
+      type: radon.nodes.docker.DockerEngineUT
+      metadata:
+        x: "957"
+        y: "334"
+        displayName: "DockerEngineUT"
+      requirements:
+        - host:
+            node: RemoteWorkstation_0
+            relationship: con_HostedOn_0
+            capability: host
+  relationship_templates:
+    con_HostedOn_0:
+      type: tosca.relationships.HostedOn
+    con_HostedOn_1:
+      type: tosca.relationships.HostedOn