M #-: Do not require CIDR in AWS IPAM

share/oneprovision/edge-clusters/metal/provisions/aws.d/networks.yml

@@ -27,7 +27,6 @@ networks:
       - provison_id: "${provision_id}"
         size: '1'
         ipam_mad: 'aws'
-        cidr: "${cluster.0.cidr}"
 
 vntemplates:
   - name: "${provision}-private"

share/oneprovision/edge-clusters/metal/provisions/aws.yml

@@ -68,3 +68,16 @@ cluster:
     - 2
   provision:
       cidr: '10.0.0.0/16'
+
+#-------------------------------------------------------------------------------
+# AWS provision parameters.
+#-------------------------------------------------------------------------------
+# This section is used by provision drivers. DO NOT MODIFY IT
+#
+#   CIDR: Private IP block for the cluster. This value HAS TO MATCH that on
+#   cluster.
+#-------------------------------------------------------------------------------
+aws_configuration:
+    cidr: '10.0.0.0/16'
+
+...

share/oneprovision/edge-clusters/virtual/provisions/aws.d/networks.yml

@@ -27,7 +27,6 @@ networks:
       - provison_id: "${provision_id}"
         size: '1'
         ipam_mad: 'aws'
-        cidr: "${cluster.0.cidr}"
 
 vntemplates:
   - name: "${provision}-private"

share/oneprovision/edge-clusters/virtual/provisions/aws.yml

@@ -68,3 +68,16 @@ cluster:
     - 2
   provision:
       cidr: '10.0.0.0/16'
+
+#-------------------------------------------------------------------------------
+# AWS provision parameters.
+#-------------------------------------------------------------------------------
+# This section is used by provision drivers. DO NOT MODIFY IT
+#
+#   CIDR: Private IP block for the cluster. This value HAS TO MATCH that on
+#   cluster.
+#-------------------------------------------------------------------------------
+aws_configuration:
+    cidr: '10.0.0.0/16'
+
+...

src/ipamm_mad/remotes/aws/register_address_range

@@ -122,11 +122,27 @@ begin
         exit(-1)
     end
 
-    cidr_s = data.xpath('//AR/CIDR').text
+    one       = OpenNebula::Client.new
+    provision = OneProvision::Provision.new_with_id(provision_id, one)
+    rc        = provision.info
+
+    if OpenNebula.is_error?(rc)
+        STDERR.puts rc.message
+        exit(-1)
+    end
+
+    aws_conf = provision.body['aws_configuration']
+
+    if aws_conf
+        cidr_s = aws_conf['cidr']
+    else
+        cidr_s = data.xpath('//AR/CIDR').text
+    end
+
     mask = cidr_s.split('/')[1]
 
     if cidr_s.empty?
-        STDERR.puts 'Missing CIDR block in address range'
+        STDERR.puts 'Missing CIDR block in aws_configuration or AR'
         exit(-1)
     end
 
@@ -137,15 +153,6 @@ begin
         exit(-1)
     end
 
-    one       = OpenNebula::Client.new
-    provision = OneProvision::Provision.new_with_id(provision_id, one)
-    rc        = provision.info
-
-    if OpenNebula.is_error?(rc)
-        STDERR.puts rc.message
-        exit(-1)
-    end
-
     provider = provision.provider
     connect  = provider.body['connection']