Merge branch 'master' into 'master'

Sander Roosalu is adding his first service and Apache service templates

See merge request dehury/radon-particles!12

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

+DevOps Lab7 Homework for Sander
\ No newline at end of file

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

+text/plain
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myApacheService_roosalu/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: "970"
+        y: "149"
+        displayName: "defaultApacheServer_roosalu"
+      properties:
+        container_port: 80
+        image_name: "httpd:2.4"
+        container_name: "myapacheserver"
+        host_port: "8083"
+      requirements:
+        - host:
+            node: DockerEngineUT_0
+            relationship: con_HostedOn_1
+            capability: host
+    RemoteWorkstation_0:
+      type: radon.nodes.VM.RemoteWorkstation
+      metadata:
+        x: "274"
+        y: "152"
+        displayName: "myWorkerVM_roosalu"
+      properties:
+        ssh_username: "centos"
+        KeyFile: "/home/ubuntu/privateKey"
+        external_ip: "192.168.42.157"
+    DockerEngineUT_0:
+      type: radon.nodes.docker.DockerEngineUT
+      metadata:
+        x: "599"
+        y: "151"
+        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_roosalu/README.md

+DevOps Lab7 Tosca Application of Sander Roosalu using Winery.
\ No newline at end of file

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

+text/plain
\ No newline at end of file

servicetemplates/radon.blueprints.examples/myfirstToscaApp_roosalu/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: "1128"
+        y: "125"
+        displayName: "defaultNginxServer_roosalu"
+      properties:
+        container_port: 80
+        image_name: "nginx:1.13"
+        container_name: "mynginxserver"
+        host_port: 8082
+      requirements:
+        - host:
+            node: DockerEngineUT_0
+            relationship: con_HostedOn_1
+            capability: host
+    RemoteWorkstation_0:
+      type: radon.nodes.VM.RemoteWorkstation
+      metadata:
+        x: "315"
+        y: "130"
+        displayName: "myWorkerVM_roosalu"
+      properties:
+        ssh_username: "centos"
+        KeyFile: "/home/ubuntu/privateKey"
+        external_ip: "192.168.42.157"
+    DockerEngineUT_0:
+      type: radon.nodes.docker.DockerEngineUT
+      metadata:
+        x: "663"
+        y: "126"
+        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