From 9ef770cb3eb7f36f306109e8a0ad16934f01c184 Mon Sep 17 00:00:00 2001
From: Alejandro Huertas Herrero <ahuertas@opennebula.systems>
Date: Thu, 7 Jan 2021 18:06:41 +0100
Subject: [PATCH] F #3951: Restructure provision templates (#599)

---
 share/oneprovision/hybrid+/description.txt    |  6 ++++-
 .../providers/aws/aws-eu-central-1.yml        | 24 +++++++++++++++++++
 .../hybrid+/providers/aws/aws-frankfurt.yml   | 20 ----------------
 .../hybrid+/providers/aws/aws-us-east-1.yml   | 21 ++++++++++++++++
 .../hybrid+/providers/aws/aws-us-east.yml     | 21 ----------------
 .../providers/packet/packet-amsterdam.yml     | 24 +++++++++++++++++++
 6 files changed, 74 insertions(+), 42 deletions(-)
 create mode 100644 share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
 delete mode 100644 share/oneprovision/hybrid+/providers/aws/aws-frankfurt.yml
 create mode 100644 share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml
 delete mode 100644 share/oneprovision/hybrid+/providers/aws/aws-us-east.yml

diff --git a/share/oneprovision/hybrid+/description.txt b/share/oneprovision/hybrid+/description.txt
index c2c29bcb15..8c631f4498 100644
--- a/share/oneprovision/hybrid+/description.txt
+++ b/share/oneprovision/hybrid+/description.txt
@@ -1 +1,5 @@
-LOREM IPSUM
+These templates deploy an infrastructure in a remote provider.
+
+They follow our elastic architecture specification, you can check more information here:
+
+    https://opennebula.io/get-true-hybrid-cloud-architecture/
diff --git a/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml b/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
new file mode 100644
index 0000000000..00b30bdaa6
--- /dev/null
+++ b/share/oneprovision/hybrid+/providers/aws/aws-eu-central-1.yml
@@ -0,0 +1,24 @@
+name: 'aws-frankfurt'
+
+provider: 'aws'
+provision: 'hybrid+'
+description: 'Elastic cluster on AWS in Frakfurt'
+
+plain:
+  image: 'AWS.webp'
+
+connection:
+  access_key: 'Encrypted AWS access key'
+  secret_key: 'Encrypted AWS secret key'
+  region: 'eu-central-1'
+
+inputs:
+   - name: 'aws_ami_image'
+     type: 'list'
+     options:
+       - 'ami-0e342d72b12109f91'
+       - 'ami-0b793c1e0d1dc4d28'
+   - name: 'aws_instance_type'
+     type: 'list'
+     options:
+       - 'i3-metal'
diff --git a/share/oneprovision/hybrid+/providers/aws/aws-frankfurt.yml b/share/oneprovision/hybrid+/providers/aws/aws-frankfurt.yml
deleted file mode 100644
index b8da0b68c0..0000000000
--- a/share/oneprovision/hybrid+/providers/aws/aws-frankfurt.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-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'
\ No newline at end of file
diff --git a/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml b/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml
new file mode 100644
index 0000000000..6829500d3c
--- /dev/null
+++ b/share/oneprovision/hybrid+/providers/aws/aws-us-east-1.yml
@@ -0,0 +1,21 @@
+name: 'aws-north-virginia'
+
+provider: 'aws'
+provision: 'hybrid+'
+description: 'Elastic cluster on AWS in North Virginia'
+
+plain:
+  image: 'AWS.webp'
+
+connection:
+  access_key: 'Encrypted AWS access key'
+  secret_key: 'Encrypted AWS secret key'
+  region: 'us-east-1'
+
+inputs:
+   aws_ami_image:
+     - 'ami-096fda3c22c1c990a'
+     - 'ami-00ddb0e5626798373'
+   aws_instance_type:
+     - 'i3-metal'
+     - 'i3.large'
diff --git a/share/oneprovision/hybrid+/providers/aws/aws-us-east.yml b/share/oneprovision/hybrid+/providers/aws/aws-us-east.yml
deleted file mode 100644
index 2d4732385c..0000000000
--- a/share/oneprovision/hybrid+/providers/aws/aws-us-east.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-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'
\ No newline at end of file
diff --git a/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml b/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
index e69de29bb2..0d8355db84 100644
--- a/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
+++ b/share/oneprovision/hybrid+/providers/packet/packet-amsterdam.yml
@@ -0,0 +1,24 @@
+name: 'packet-amsterdam'
+
+provider: 'packet'
+provision: 'hybrid+'
+description: 'Elastic cluster on Packet in Amsterdam'
+
+plain:
+  image: 'Packet.webp'
+
+connection:
+  token: 'Encrypted Packet token'
+  project: 'Encrypted Packet project'
+  facility: 'ams1'
+
+inputs:
+   - name: 'packet_os'
+     type: 'list'
+     options:
+       - 'centos_7'
+       - 'ubuntu_18_04'
+   - name: 'packet_plan'
+     type: 'list'
+     options:
+       - 'baremetal_0'