F #3951: Restructure provision templates

share/oneprovision/hybrid+/description.txt

@@ -0,0 +1 @@
+LOREM IPSUM

share/oneprovision/hybrid+/providers/aws/aws-frankfurt.yml

@@ -0,0 +1,20 @@
+name: 'aws-frankfurt'
+
+provider: 'aws'
+provision: 'hybrid+'
+description: "LOREM IPSUM"
+
+plain:
+  image: 'AWS.webp'
+
+connection:
+  access_key: "Encrypted aws access key"
+  secret_key: "Encrypted aws secret key"
+
+
+inputs:
+   aws_ami_image:
+     - 'ami-6753'
+     - 'ami-5654'
+   aws_instance_type:
+     - 'i3-metal'

share/oneprovision/hybrid+/providers/aws/aws-us-east.yml

@@ -0,0 +1,21 @@
+name: 'aws-us-east'
+
+provider: 'aws'
+provision: 'hybrid+'
+description: "LOREM IPSUM"
+
+plain:
+  image: 'AWS.webp'
+
+connection:
+  access_key: "Encrypted aws access key"
+  secret_key: "Encrypted aws secret key"
+
+
+inputs:
+   aws_ami_image:
+     - 'ami-4645'
+     - 'ami-6578'
+   aws_instance_type:
+     - 'i3-metal'
+     - 'i4-metal'

share/oneprovision/hybrid+/provisions/aws.yml

@@ -21,6 +21,7 @@
 # ------------------------------------------------------------------------------
 
 name: "aws-cluster"
+provision: "hybrid+"
 
 extends:
     - common.d/defaults.yml

share/oneprovision/hybrid+/provisions/packet.yml

@@ -22,6 +22,8 @@
 
 name: "packet-cluster"
 
+provision: 'hybrid+'
+
 extends:
     - common.d/defaults.yml
     - common.d/resources.yml

share/oneprovision/providers/aws.yml

@@ -1,22 +0,0 @@
-name: 'aws'
-
-plain:
-  image: 'AWS.webp'
-
-connection:
-  access_key: "Encrypted aws access key"
-  secret_key: "Encrypted aws secret key"
-
-location_key: 'region'
-
-locations:
-  us-east-1:
-      aws_ami_image: 
-         - 'ami-12345'
-      aws_instance_type: 
-         - 'i3-metal'
-  us-east-2:
-      aws_ami_image: 
-         - 'ami-6789'
-      aws_instance_type: 
-         - 'i4-metal'

share/oneprovision/providers/packet.yml

@@ -1,22 +0,0 @@
-name: 'packet'
-
-plain:
-  image: 'EQUINIX.webp'
-
-connection:
-  token: 'Encrypted Packet token'
-  project: 'Encrypted Packet project'
-
-location_key: 'facility'
-
-locations:
-  ams1:
-    packet_os: 
-      -'centos_7'
-    packet_plan: 
-      - 'baremetal_0'
-  ams2:
-    packet_os: 
-      -'ubuntu_18_04'
-    packet_plan: 
-      -'baremetal_1'