diff --git a/README.md b/README.md
index 408c9072..823088ad 100644
--- a/README.md
+++ b/README.md
@@ -155,8 +155,13 @@ Environment=GEM_PATH=/usr/local/rvm/gems/ruby-2.5.8:/usr/local/rvm/gems/ruby-2.5
PUBLIC_NETWORK_DEFAULTS |
- NETWORK_ID |
- Public IPs pool network ID |
+ PAAS |
+ Public IPs pool network ID for PaaS |
+
+
+ |
+ IAAS |
+ Public IPs pool network ID for IaaS |
VNETS_TEMPLATES |
diff --git a/core/settings.rb b/core/settings.rb
index 544ea748..4ce294ad 100644
--- a/core/settings.rb
+++ b/core/settings.rb
@@ -21,7 +21,7 @@
['IAAS_GROUP_ID', 100, "IaaS(VDC) Users group ID", 1, "int"],
['NODES_DEFAULT', "{\"VCENTER\":\"host_id\"}", "Default nodes for different hypervisors", 1, "object"],
['PUBLIC_IP_COST', 0.0, "Public IP Address cost per sec", 0, "float"],
- ['PUBLIC_NETWORK_DEFAULTS', "{\"NETWORK_ID\":\"network_id\"}", "Default Public Network Pool ID", 1, "object"],
+ ['PUBLIC_NETWORK_DEFAULTS', "{\"IAAS\":\"0\", \"PAAS\": \"0\"}", "Default Public Network Pool IDs for IaaS and PaaS", 1, "object"],
['CURRENCY_MAIN', "€", "Currency", 0, "str"],
['TRAFFIC_COST', 0.0, "Cost of 1 kByte VM traffic", 0, "float"],
['TRAFFIC_BILL_FREQ', 86400, "Frequency of debits for Traffic usage in seconds", 1, "int"],
diff --git a/lib/creative_funcs/main.rb b/lib/creative_funcs/main.rb
index 08eda817..98b7d96b 100644
--- a/lib/creative_funcs/main.rb
+++ b/lib/creative_funcs/main.rb
@@ -353,7 +353,7 @@ def CreateVMwithSpecs(params, trace = ["#{__method__} method called:#{__LINE__}"
trace << "Setting up NICs:#{__LINE__ + 1}"
specs['NIC'] = []
params['ips'].times do
- specs['NIC'] << { NETWORK_ID: IONe::Settings['PUBLIC_NETWORK_DEFAULTS']['NETWORK_ID'] }
+ specs['NIC'] << { NETWORK_ID: IONe::Settings['PUBLIC_NETWORK_DEFAULTS']['PAAS'] }
end
LOG_DEBUG "Resulting capacity template:\n" + specs.debug_out
diff --git a/lib/vntools/main.rb b/lib/vntools/main.rb
index 2e99ef78..1d8c7528 100644
--- a/lib/vntools/main.rb
+++ b/lib/vntools/main.rb
@@ -11,7 +11,7 @@ class IONe
def reserve_public_ip params
params.to_sym!
- vnet = onblock(:vn, IONe::Settings['PUBLIC_NETWORK_DEFAULTS']['NETWORK_ID'], @client)
+ vnet = onblock(:vn, IONe::Settings['PUBLIC_NETWORK_DEFAULTS']['IAAS'], @client)
vnet.info!
u = onblock(:u, params[:u], @client)