Merge pull request #39 from sych74/v2.2.0

V2.2.0 Opensearch support

Author: sych74

manifest.yml

@@ -1,6 +1,6 @@
 jpsType: install
 jpsVersion: '1.7.4'
-id: magento-v210
+id: magento
 name: Magento Standalone
 homepage: http://www.magentocommerce.com/
 description:
@@ -12,7 +12,7 @@ categories:
 
 logo: /images/magento.png
 
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/magento/v2.1.0
+baseUrl: https://raw.githubusercontent.com/sych74/magento/v2.2.0
 
 onBeforeInit: /scripts/beforeinit.js?_r=${fn.random}
 onBeforeInstall: /scripts/beforeinstall.js?_r=${fn.random}
@@ -110,7 +110,7 @@ onAfterMigrate:
           domain: ${env.domain}
 
 globals:
-  SCRIPTS_PATH: https://raw.githubusercontent.com/jelastic-jps/magento-cluster/v2.1.0/scripts
+  SCRIPTS_PATH: https://raw.githubusercontent.com/jelastic-jps/magento-cluster/v2.2.0/scripts
   DB_USER: jelastic-${fn.random}
   DB_PASS: ${fn.password(10)}
   DB_HOST: 127.0.0.1

scripts/beforeinit.js

@@ -35,16 +35,17 @@ var extIP = "environment.externalip.enabled",
     extIPperEnv = "environment.externalip.maxcount",
     extIPperNode = "environment.externalip.maxcount.per.node",
     maxCloudletsPerRec = "environment.maxcloudletsperrec",
-    isDocker = "environment.docker.enabled",
+    maxEnvs = "environment.maxcount",
+    envsCount = jelastic.env.control.GetEnvs({lazy: true}).infos.length,
     markup = "", cur = null, text = "used", LE = true, prod = true;
 
-var quotas = jelastic.billing.account.GetQuotas(extIP + ";"+extIPperEnv+";" + extIPperNode +";" + maxCloudletsPerRec +";" + isDocker).array;
+var quotas = jelastic.billing.account.GetQuotas(extIP + ";"+extIPperEnv+";" + extIPperNode +";" + maxCloudletsPerRec +";" + maxEnvs).array;
 for (var i = 0; i < quotas.length; i++){
     var q = quotas[i], n = toNative(q.quota.name);
 
-    if (n == isDocker &&  !q.value){
-        err(q, "required", 1, true);
-        prod  = false; 
+    if (n == maxEnvs && envsCount >= q.value){
+        err(q, "already used", envsCount, true);
+        prod = false; break;
     }
 
     if (n == maxCloudletsPerRec && q.value < 32){

scripts/beforeinstall.js

@@ -44,18 +44,15 @@ if ('${settings.ls_addon:false}'== 'true') {
 }
 
 resp.nodes.push({
-  nodeType: "docker",
+  nodeType: "opensearch",
   count: 1,
   flexibleCloudlets: ${settings.st_flexibleCloudlets:16},
   fixedCloudlets: ${settings.st_fixedCloudlets:1},
-  nodeGroup: "elasticsearch",
-  dockerName: "elasticsearch",
-  dockerTag: "7.12.1",
-  displayName: "Elasticsearch",
-  env: {
-    ES_JAVA_OPTS: "-Xms512m -Xmx512m",
-    ELASTIC_PASSWORD: "${globals.ES_PASS}",
-    JELASTIC_EXPOSE: "9200"
+  nodeGroup: "nosqldb",
+  displayName: "OpenSearch",
+  cluster: {
+    is_opensearchdashboards: false,
+    success_email: false,
   }
 })
 

success/email/lemp/oneregion-cdn.md

@@ -8,16 +8,14 @@ Use the following credentials to access the admin panel:
 **Login**: admin  
 **Password**: ${globals.MG_ADMIN_PASS}  
 
-Use the following credentials to access the Elasticsearch admin panel:
-
-**Admin Panel**: [http://docker${nodes.elasticsearch.master.id}-${env.domain}](http://docker${nodes.elasticsearch.master.id}-${env.domain})  
-**Username**: elastic  
-**Password**: ${globals.ES_PASS}  
-
 Manage the database nodes using the next credentials:
 
 **phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)  
 **Username**: ${globals.DB_USER}    
 **Password**: ${globals.DB_PASS}  
 
+Use the following credentials to access the OpenSearch:
 
+**Access URL**: [http://node${nodes.nosqldb.master.id}-${env.domain}:4949](http://node${nodes.nosqldb.master.id}-${env.domain}:4949)  
+**Login**: admin  
+**Password**: ${globals.ES_PASS}  

success/email/lemp/oneregion-default.md

@@ -6,15 +6,14 @@ Use the following credentials to access the admin panel:
 **Login**: admin  
 **Password**: ${globals.MG_ADMIN_PASS}  
 
-Use the following credentials to access the Elasticsearch admin panel:
-
-**Admin Panel**: [http://docker${nodes.elasticsearch.master.id}-${env.domain}](http://docker${nodes.elasticsearch.master.id}-${env.domain})  
-**Username**: elastic  
-**Password**: ${globals.ES_PASS}  
-
 Manage the database nodes using the next credentials:
 
 **phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)  
 **Username**: ${globals.DB_USER}    
 **Password**: ${globals.DB_PASS}  
 
+Use the following credentials to access the OpenSearch:
+
+**Access URL**: [http://node${nodes.nosqldb.master.id}-${env.domain}:4949](http://node${nodes.nosqldb.master.id}-${env.domain}:4949)  
+**Login**: admin  
+**Password**: ${globals.ES_PASS} 

success/email/llsmp/oneregion-cdn.md

@@ -14,15 +14,14 @@ Use the following credentials to access the LiteSpeed WEB Server admin console:
 **Login**: admin  
 **Password**: ${globals.LS_ADMIN_PASS}  
 
-Use the following credentials to access the Elasticsearch admin panel:
-
-**Admin Panel**: [http://docker${nodes.elasticsearch.master.id}-${env.domain}](http://docker${nodes.elasticsearch.master.id}-${env.domain})  
-**Username**: elastic  
-**Password**: ${globals.ES_PASS}  
-
 Manage the database nodes using the next credentials:
 
 **phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)  
 **Username**: ${globals.DB_USER}    
 **Password**: ${globals.DB_PASS}  
 
+Use the following credentials to access the OpenSearch:
+
+**Access URL**: [http://node${nodes.nosqldb.master.id}-${env.domain}:4949](http://node${nodes.nosqldb.master.id}-${env.domain}:4949)  
+**Login**: admin  
+**Password**: ${globals.ES_PASS}  

success/email/llsmp/oneregion-default.md

@@ -12,15 +12,14 @@ Use the following credentials to access the LiteSpeed WEB Server admin console:
 **Login**: admin  
 **Password**: ${globals.LS_ADMIN_PASS}  
 
-Use the following credentials to access the Elasticsearch admin panel:
-
-**Admin Panel**: [http://docker${nodes.elasticsearch.master.id}-${env.domain}](http://docker${nodes.elasticsearch.master.id}-${env.domain})  
-**Username**: elastic  
-**Password**: ${globals.ES_PASS}  
-
 Manage the database nodes using the next credentials:
 
 **phpMyAdmin Panel**: [https://${env.domain}:8443/](https://${env.domain}:8443/)  
 **Username**: ${globals.DB_USER}    
 **Password**: ${globals.DB_PASS}  
 
+Use the following credentials to access the OpenSearch:
+
+**Access URL**: [http://node${nodes.nosqldb.master.id}-${env.domain}:4949](http://node${nodes.nosqldb.master.id}-${env.domain}:4949)  
+**Login**: admin  
+**Password**: ${globals.ES_PASS}