Commit bb8326aa authored by Spiros Koulouzis's avatar Spiros Koulouzis

changed interfaces

parent 078627d8
...@@ -29,6 +29,17 @@ topology_template: ...@@ -29,6 +29,17 @@ topology_template:
capability: "tosca.capabilities.ARTICONF.VM.topology" capability: "tosca.capabilities.ARTICONF.VM.topology"
node: "topology" node: "topology"
relationship: "tosca.relationships.HostedOn" relationship: "tosca.relationships.HostedOn"
interfaces:
Standard:
configure:
inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_dashboard.yaml"
create:
inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_install.yml"
delete:
inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_delete.yaml"
type: "tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes" type: "tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes"
topology: topology:
properties: properties:
...@@ -62,11 +73,6 @@ topology_template: ...@@ -62,11 +73,6 @@ topology_template:
code_type: "SEQ" code_type: "SEQ"
object_type: "SubTopology" object_type: "SubTopology"
type: "tosca.nodes.ARTICONF.VM.topology" type: "tosca.nodes.ARTICONF.VM.topology"
artifacts:
provisioned_files:
required: false
type: "string"
topology_1: topology_1:
properties: properties:
domain: "Frankfurt" domain: "Frankfurt"
...@@ -103,7 +109,6 @@ topology_template: ...@@ -103,7 +109,6 @@ topology_template:
provisioned_files: provisioned_files:
required: false required: false
type: "string" type: "string"
ws-pema: ws-pema:
properties: properties:
ports: ports:
......
...@@ -3,10 +3,10 @@ topology_template: ...@@ -3,10 +3,10 @@ topology_template:
node_templates: node_templates:
compute: compute:
properties: properties:
disk_size: "50000 MB" disk_size: "10000 MB"
mem_size: "6000 MB" mem_size: "1000 MB"
num_cores: 2 num_cores: 1
os: "Centos 7.6" os: "Ubuntu 18.04"
user_name: "vm_user" user_name: "vm_user"
interfaces: interfaces:
Standard: Standard:
...@@ -14,19 +14,16 @@ topology_template: ...@@ -14,19 +14,16 @@ topology_template:
type: "tosca.nodes.ARTICONF.VM.Compute" type: "tosca.nodes.ARTICONF.VM.Compute"
compute_1: compute_1:
properties: properties:
disk_size: "50000 MB" disk_size: "10000 MB"
mem_size: "6000 MB" mem_size: "1000 MB"
num_cores: 2 num_cores: 1
os: "Centos 7.6" os: "Ubuntu 18.04"
user_name: "vm_user" user_name: "vm_user"
interfaces: interfaces:
Standard: Standard:
create: "dumy.yaml" create: "dumy.yaml"
type: "tosca.nodes.ARTICONF.VM.Compute" type: "tosca.nodes.ARTICONF.VM.Compute"
kubernetes: kubernetes:
properties:
min_masters_num: 1
min_workers_num: 1
requirements: requirements:
- host: - host:
capability: "tosca.capabilities.ARTICONF.VM.topology" capability: "tosca.capabilities.ARTICONF.VM.topology"
...@@ -34,57 +31,20 @@ topology_template: ...@@ -34,57 +31,20 @@ topology_template:
relationship: "tosca.relationships.HostedOn" relationship: "tosca.relationships.HostedOn"
interfaces: interfaces:
Standard: Standard:
configure:
inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_dashboard.yaml"
create: create:
inputs: inputs:
inventory-file: "k8s_hosts" playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_install.yml"
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/install_k8s.yml" delete:
inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_delete.yaml"
type: "tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes" type: "tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes"
logspout:
properties:
environment:
publish: "127.0.0.1:8000:80"
ports:
- "8000:80"
volumes:
- "/etc/hostname:/etc/host_hostname:ro"
- "/var/run/docker.sock:/var/run/docker.sock"
requirements:
- host:
capability: "tosca.capabilities.ARTICONF.Orchestrator"
node: "kubernetes"
relationship: "tosca.relationships.HostedOn"
type: "tosca.nodes.ARTICONF.Container.Application.Docker"
artifacts:
image:
file: "gliderlabs/logspout:latest"
repository: "docker_hub"
type: "tosca.artifacts.Deployment.Image.Container.Docker"
mysql:
properties:
environment:
MYSQL_DATABASE: "wordpress"
MYSQL_PASSWORD: "wordpress"
MYSQL_ROOT_PASSWORD: "somewordpress"
MYSQL_USER: "wordpress"
ports:
- "3306:3306"
volumes:
- "db_data:/var/lib/mysql"
requirements:
- host:
capability: "tosca.capabilities.ARTICONF.Orchestrator"
node: "kubernetes"
relationship: "tosca.relationships.HostedOn"
type: "tosca.nodes.ARTICONF.Container.Application.Docker"
artifacts:
image:
file: "mysql:5.7"
repository: "docker_hub"
type: "tosca.artifacts.Deployment.Image.Container.Docker"
topology: topology:
properties: properties:
domain: "UvA (Amsterdam, The Netherlands) XO Rack" domain: "Frankfurt"
provider: "ExoGENI" provider: "EC2"
requirements: requirements:
- vm: - vm:
capability: "tosca.capabilities.ARTICONF.VM" capability: "tosca.capabilities.ARTICONF.VM"
...@@ -96,49 +56,46 @@ topology_template: ...@@ -96,49 +56,46 @@ topology_template:
relationship: "tosca.relationships.DependsOn" relationship: "tosca.relationships.DependsOn"
interfaces: interfaces:
CloudsStorm: CloudsStorm:
delete:
inputs:
code_type: "SEQ"
object_type: "SubTopology"
hscale:
inputs:
code_type: "SEQ"
object_type: "SubTopology"
provision: provision:
inputs: inputs:
code_type: "SEQ" code_type: "SEQ"
object_type: "SubTopology" object_type: "SubTopology"
start:
inputs:
code_type: "SEQ"
object_type: "SubTopology"
stop:
inputs:
code_type: "SEQ"
object_type: "SubTopology"
type: "tosca.nodes.ARTICONF.VM.topology" type: "tosca.nodes.ARTICONF.VM.topology"
wordpress: artifacts:
provisioned_files:
required: false
type: "string"
ws-pema:
properties: properties:
environment:
WORDPRESS_DB_HOST: "mysql:3306"
WORDPRESS_DB_NAME: "wordpress"
WORDPRESS_DB_PASSWORD: "wordpress"
WORDPRESS_DB_USER: "wordpress"
ports: ports:
- "8000:80" - "30001:8080"
requirements: requirements:
- service:
node: "mysql"
relationship:
type: "tosca.relationships.DependsOn"
- host: - host:
capability: "tosca.capabilities.ARTICONF.Orchestrator" capability: "tosca.capabilities.ARTICONF.docker.Orchestrator"
node: "kubernetes" node: "kubernetes"
relationship: "tosca.relationships.HostedOn" relationship: "tosca.relationships.HostedOn"
type: "tosca.nodes.ARTICONF.Container.Application.Docker" type: "tosca.nodes.ARTICONF.Container.Application.Docker"
artifacts: artifacts:
image: image:
file: "wordpress:latest" file: "alogo53/ws-pema-lifewatch"
repository: "docker_hub" repository: "docker_hub"
type: "tosca.artifacts.Deployment.Image.Container.Docker" type: "tosca.artifacts.Deployment.Image.Container.Docker"
policies:
- scalability:
properties:
constraint_name: "cpu_load"
max_value: 90
targets:
- "wordpress"
type: "tosca.policies.ARTICONF.Performance.CPU"
- faultTolerance:
properties:
level: 1
targets:
- "mysql"
type: "tosca.policies.ARTICONF.FaultTolerance"
description: "TOSCA example" description: "TOSCA example"
imports: imports:
- nodes: "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/nodes.yaml" - nodes: "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/nodes.yaml"
......
This diff is collapsed.
description: TOSCA example tosca_definitions_version: "tosca_simple_yaml_1_0"
imports:
- nodes: https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/nodes.yaml
- data: https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/data.yml
- capabilities: https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/capabilities.yaml
- policies: https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/policies.yaml
- interfaces: https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/interfaces.yml
topology_template: topology_template:
node_templates: node_templates:
kubernetes: kubernetes:
properties: interfaces:
min_masters_num: 1 Standard:
min_workers_num: 1 configure:
type: tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_dashboard.yaml"
create:
tosca_definitions_version: tosca_simple_yaml_1_0 inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_install.yml"
delete:
inputs:
playbook: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_delete.yaml"
type: "tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes"
description: "TOSCA example"
imports:
- nodes: "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/nodes.yaml"
- data: "https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/data.yml"
- capabilities: "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/capabilities.yaml"
- policies: "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/policies.yaml"
- interfaces: "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/interfaces.yml"
This diff is collapsed.
{"toscaTemplate": {"description": "TOSCA example", "imports": [{"nodes": "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/nodes.yaml"}, {"data": "https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/data.yml"}, {"capabilities": "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/capabilities.yaml"}, {"policies": "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/policies.yaml"}, {"interfaces": "https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/interfaces.yml"}], "tosca_definitions_version": "tosca_simple_yaml_1_0", "topology_template": {"node_templates": {"compute": {"interfaces": {"Standard": {"create": "dumy.yaml"}}, "properties": {"disk_size": "10000 MB", "mem_size": "1000 MB", "num_cores": 1, "os": "Ubuntu 18.04", "user_name": "vm_user"}, "type": "tosca.nodes.ARTICONF.VM.Compute"}, "compute_1": {"interfaces": {"Standard": {"create": "dumy.yaml"}}, "properties": {"disk_size": "10000 MB", "mem_size": "1000 MB", "num_cores": 1, "os": "Ubuntu 18.04", "user_name": "vm_user"}, "type": "tosca.nodes.ARTICONF.VM.Compute"}, "kubernetes": {"interfaces": {"Standard": {"configure": {"inputs": {"playbook": "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_dashboard.yaml"}}, "create": {"inputs": {"playbook": "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_install.yml"}}, "delete": {"inputs": {"playbook": "https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_delete.yaml"}}}}, "requirements": [{"host": {"capability": "tosca.capabilities.ARTICONF.VM.topology", "node": "topology", "relationship": "tosca.relationships.HostedOn"}}], "type": "tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes"}, "topology": {"artifacts": {"provisioned_files": {"required": false, "type": "string"}}, "interfaces": {"CloudsStorm": {"delete": {"inputs": {"code_type": "SEQ", "object_type": "SubTopology"}}, "hscale": {"inputs": {"code_type": "SEQ", "object_type": "SubTopology"}}, "provision": {"inputs": {"code_type": "SEQ", "object_type": "SubTopology"}}, "start": {"inputs": {"code_type": "SEQ", "object_type": "SubTopology"}}, "stop": {"inputs": {"code_type": "SEQ", "object_type": "SubTopology"}}}}, "properties": {"domain": "Frankfurt", "provider": "EC2"}, "requirements": [{"vm": {"capability": "tosca.capabilities.ARTICONF.VM", "node": "compute", "relationship": "tosca.relationships.DependsOn"}}, {"vm": {"capability": "tosca.capabilities.ARTICONF.VM", "node": "compute_1", "relationship": "tosca.relationships.DependsOn"}}], "type": "tosca.nodes.ARTICONF.VM.topology"}, "ws-pema": {"artifacts": {"image": {"file": "alogo53/ws-pema-lifewatch", "repository": "docker_hub", "type": "tosca.artifacts.Deployment.Image.Container.Docker"}}, "properties": {"ports": ["30001:8080"]}, "requirements": [{"host": {"capability": "tosca.capabilities.ARTICONF.docker.Orchestrator", "node": "kubernetes", "relationship": "tosca.relationships.HostedOn"}}], "type": "tosca.nodes.ARTICONF.Container.Application.Docker"}}}}, "creationDate": 1585325490086}
{"owner":"user","creationDate":1584702876299,"toscaTemplate":{"tosca_definitions_version":"tosca_simple_yaml_1_0","topology_template":{"node_templates":{"compute":{"properties":{"disk_size":"10000 MB","mem_size":"1000 MB","num_cores":1,"os":"Ubuntu 18.04","user_name":"vm_user"},"interfaces":{"Standard":{"create":"dumy.yaml"}},"type":"tosca.nodes.ARTICONF.VM.Compute"},"compute_1":{"properties":{"disk_size":"10000 MB","mem_size":"1000 MB","num_cores":1,"os":"Ubuntu 18.04","user_name":"vm_user"},"interfaces":{"Standard":{"create":"dumy.yaml"}},"type":"tosca.nodes.ARTICONF.VM.Compute"},"kubernetes":{"requirements":[{"host":{"capability":"tosca.capabilities.ARTICONF.VM.topology","node":"topology","relationship":"tosca.relationships.HostedOn"}}],"interfaces":{"Kubernetes":{"configure":{"inputs":{"playbook":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/dashboard.yaml"}},"create":{"inputs":{"playbook":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/create_k8s.yml"}},"install":{"inputs":{"playbook":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/install_k8s.yml"}}}},"type":"tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes"},"topology":{"properties":{"domain":"Frankfurt","provider":"EC2"},"requirements":[{"vm":{"capability":"tosca.capabilities.ARTICONF.VM","node":"compute","relationship":"tosca.relationships.DependsOn"}},{"vm":{"capability":"tosca.capabilities.ARTICONF.VM","node":"compute_1","relationship":"tosca.relationships.DependsOn"}}],"interfaces":{"CloudsStorm":{"delete":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"hscale":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"provision":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"start":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"stop":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}}}},"type":"tosca.nodes.ARTICONF.VM.topology","attributes":{"credential":{"cloud_provider_name":"EC2","keys":{"aws_access_key_id":"XXXXXXXXXXXXXXX"},"token":"XXXXXXXXXXXXXXXXX","token_type":"access_key"},"desired_state":"RUNNING"}},"ws-pema":{"properties":{"ports":["30001:8080"]},"requirements":[{"host":{"capability":"tosca.capabilities.ARTICONF.docker.Orchestrator","node":"kubernetes","relationship":"tosca.relationships.HostedOn"}}],"type":"tosca.nodes.ARTICONF.Container.Application.Docker","artifacts":{"image":{"file":"alogo53/ws-pema-lifewatch","repository":"docker_hub","type":"tosca.artifacts.Deployment.Image.Container.Docker"}}}}},"description":"TOSCA example","imports":[{"nodes":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/nodes.yaml"},{"data":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/data.yml"},{"capabilities":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/capabilities.yaml"},{"policies":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/policies.yaml"},{"interfaces":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/interfaces.yml"}]}} {"owner":"user","creationDate":1585325797006,"toscaTemplate":{"tosca_definitions_version":"tosca_simple_yaml_1_0","tosca_default_namespace":null,"template_name":null,"topology_template":{"description":null,"inputs":null,"node_templates":{"compute":{"properties":{"disk_size":"10000 MB","mem_size":"1000 MB","num_cores":1,"os":"Ubuntu 18.04","user_name":"vm_user"},"interfaces":{"Standard":{"create":"dumy.yaml"}},"type":"tosca.nodes.ARTICONF.VM.Compute"},"compute_1":{"properties":{"disk_size":"10000 MB","mem_size":"1000 MB","num_cores":1,"os":"Ubuntu 18.04","user_name":"vm_user"},"interfaces":{"Standard":{"create":"dumy.yaml"}},"type":"tosca.nodes.ARTICONF.VM.Compute"},"kubernetes":{"requirements":[{"host":{"capability":"tosca.capabilities.ARTICONF.VM.topology","node":"topology","relationship":"tosca.relationships.HostedOn"}}],"interfaces":{"Standard":{"configure":{"inputs":{"playbook":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_dashboard.yaml"}},"create":{"inputs":{"playbook":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_install.yml"}},"delete":{"inputs":{"playbook":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/ansible_playbooks/k8s_delete.yaml"}}}},"type":"tosca.nodes.ARTICONF.docker.Orchestrator.Kubernetes"},"topology":{"properties":{"domain":"Frankfurt","provider":"EC2"},"requirements":[{"vm":{"capability":"tosca.capabilities.ARTICONF.VM","node":"compute","relationship":"tosca.relationships.DependsOn"}},{"vm":{"capability":"tosca.capabilities.ARTICONF.VM","node":"compute_1","relationship":"tosca.relationships.DependsOn"}}],"interfaces":{"CloudsStorm":{"delete":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"hscale":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"provision":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"start":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}},"stop":{"inputs":{"code_type":"SEQ","object_type":"SubTopology"}}}},"type":"tosca.nodes.ARTICONF.VM.topology","attributes":{"credential":{"cloud_provider_name":"EC2","keys":{"aws_access_key_id":"XXXXXXXXXXXXXXXX"},"token":"XXXXXXXXXXXXX","token_type":"access_key"},"desired_state":"RUNNING"},"artifacts":{"provisioned_files":{"required":false,"type":"string"}}},"ws-pema":{"properties":{"ports":["30001:8080"]},"requirements":[{"host":{"capability":"tosca.capabilities.ARTICONF.docker.Orchestrator","node":"kubernetes","relationship":"tosca.relationships.HostedOn"}}],"type":"tosca.nodes.ARTICONF.Container.Application.Docker","artifacts":{"image":{"file":"alogo53/ws-pema-lifewatch","repository":"docker_hub","type":"tosca.artifacts.Deployment.Image.Container.Docker"}}}},"relationship_templates":null,"outputs":null,"groups":null,"substitution_mappings":null,"policies":null},"template_author":null,"template_version":null,"description":"TOSCA example","imports":[{"nodes":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/nodes.yaml"},{"data":"https://raw.githubusercontent.com/skoulouzis/CONF/develop/TOSCA/types/data.yml"},{"capabilities":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/capabilities.yaml"},{"policies":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/policies.yaml"},{"interfaces":"https://raw.githubusercontent.com/skoulouzis/DRIP/develop/TOSCA/types/interfaces.yml"}],"dsl_definitions":null,"node_types":null,"relationship_types":null,"relationship_templates":null,"capability_types":null,"artifact_types":null,"data_types":null,"interface_types":null,"policy_types":null,"group_types":null,"repositories":null}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment