change defaults

TOSCA/types/interfaces.yml

@@ -67,8 +67,7 @@ interface_types:
     inputs:
       inventory_file:
         type: string
-        required: true
-        default: k8s_hosts
+        required: false
       playbook:
         type: string
         required: false

TOSCA/types/nodes.yaml

@@ -74,11 +74,9 @@ node_types:
             type: tosca.interfaces.ARTICONF.Kubernetes
             install:
                 inputs:
-                    inventory_file: k8s_hosts
                     playbook: https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/ansible_playbooks/install_k8s.yml
             create:
                 inputs:
-                    inventory_file: k8s_hosts
                     playbook: https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/ansible_playbooks/install_k8s.yml                    
                     
         
@@ -114,12 +112,12 @@ node_types:
       domain:        
         type: string
         required: true
-        default: "UvA (Amsterdam, The Netherlands) XO Rack"
-        description: the domain of this topology e.g. California, UvA, etc           
+        default: "Frankfurt"
+        description: the domain of this topology e.g. California, UvA (Amsterdam, The Netherlands) XO Rack, etc           
       provider:
         type: string
         required: true
-        default: "ExoGENI"
+        default: "EC2"
         description: The name of the provider e.g. EC2, ExoGENI etc.    
       coordinates: 
         type: tosca.datatypes.ARTICONF.coordinates

drip-provisioner/etc/UD/EC2.yml

@@ -163,3 +163,60 @@ DCMetaInfo:
     extraInfo:
       AMI: "ami-2581aa40"
    
+   
+   
+- domain: "Frankfurt"
+  endpoint: "ec2.eu-central-1.amazonaws.com"
+  country: Germany
+  longitude: "50.1109"
+  latitude: "8.68213"
+  availability: null 
+  VMMetaInfo:
+  - OS: "Ubuntu 18.04"
+    CPU: 1
+    MEM: 0.5
+    VMType: "t2.nano"
+    Price: 0.0058
+    DefaultSSHAccount: "ubuntu"
+    extraInfo:
+      AMI: "ami-0b418580298265d5c"
+  - OS: "Ubuntu 18.04"
+    CPU: 1
+    MEM: 1
+    VMType: "t2.micro"
+    Price: 0.0116
+    DefaultSSHAccount: "ubuntu"
+    extraInfo:
+      AMI: "ami-0b418580298265d5c"
+  - OS: "Ubuntu 18.04"
+    CPU: 1
+    MEM: 2
+    VMType: "t2.small"
+    Price: 0.0116
+    DefaultSSHAccount: "ubuntu"
+    extraInfo:
+      AMI: "ami-0b418580298265d5c"
+  - OS: "Ubuntu 18.04"
+    CPU: 2
+    MEM: 4
+    VMType: "t2.medium"
+    Price: 0.0464
+    DefaultSSHAccount: "ubuntu"
+    extraInfo:
+      AMI: "ami-0b418580298265d5c"
+  - OS: "Ubuntu 18.04"
+    CPU: 2
+    MEM: 8
+    VMType: "t2.large"
+    Price: 0.0464
+    DefaultSSHAccount: "ubuntu"
+    extraInfo:
+      AMI: "ami-0b418580298265d5c"
+  - OS: "Ubuntu 18.04"
+    CPU: 4
+    MEM: 16
+    VMType: "t2.xlarge"
+    Price: 0.0464
+    DefaultSSHAccount: "ubuntu"
+    extraInfo:
+      AMI: "ami-0b418580298265d5c"