stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject stratos git commit: Fixing single cartridge application deployment policies
Date Fri, 06 Feb 2015 08:20:33 GMT
Repository: stratos
Updated Branches:
  refs/heads/master ce870ebd2 -> 9f09f2056


Fixing single cartridge application deployment policies


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9f09f205
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9f09f205
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9f09f205

Branch: refs/heads/master
Commit: 9f09f2056fbf350da9c27bb5695cd0a2d8416027
Parents: ce870eb
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Fri Feb 6 13:50:23 2015 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Fri Feb 6 13:50:23 2015 +0530

----------------------------------------------------------------------
 .../artifacts/ec2/deployment-policy.json        |  7 +-
 .../artifacts/kubernetes/deployment-policy.json | 74 ++++++++++----------
 .../artifacts/openstack/deployment-policy.json  |  4 +-
 .../scripts/kubernetes/deploy.sh                |  2 +
 4 files changed, 44 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/9f09f205/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json b/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
index aae50b5..e690bbf 100644
--- a/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/ec2/deployment-policy.json
@@ -11,7 +11,7 @@
                         "property": [
                             {
                                 "name": "region",
-                                "value": "ap-southeast-1"
+                                "value": "default"
                             }
                         ]
                     }
@@ -29,12 +29,11 @@
                     "partitions": [
                         {
                             "id": "partition-1",
-                            "max": 8
+                            "max": 5
                         }
                     ]
                 }
             ]
         }
     ]
-}
-
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/9f09f205/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
b/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
index d199695..4913158 100644
--- a/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/kubernetes/deployment-policy.json
@@ -1,40 +1,40 @@
 {
-   "applicationPolicy":{
-      "networkPartition":[
-         {
-            "id":"network-partition-1",
-            "kubernetesClusterId":"kubernetes-cluster-1",
-            "activeByDefault":"true",
-            "partitions":[
-               {
-                  "id":"partition1",
-                  "provider":"kubernetes",
-                  "property":[
-                     {
-                        "name":"region",
-                        "value":"default"
-                     }
-                  ]
-               }
-            ]
-         }
-      ]
-   },
-   "childPolicies":[
-      {
-         "alias":"phpartition1",
-         "networkPartition":[
+    "applicationPolicy": {
+        "networkPartition": [
             {
-               "id":"network-partition-1",
-               "partitionAlgo":"one-after-another",
-               "partitions":[
-                  {
-                     "id":"partition1",
-                     "max":5
-                  }
-               ]
+                "id": "network-partition-1",
+                "activeByDefault": "true",
+                "partitions": [
+                    {
+                        "id": "partition-1",
+                        "provider": "kubernetes",
+                        "property": [
+                            {
+                                "name": "region",
+                                "value": "default"
+                            }
+                        ]
+                    }
+                ]
             }
-         ]
-      }
-   ]
-}
\ No newline at end of file
+        ]
+    },
+    "childPolicies": [
+        {
+            "alias": "php1",
+            "networkPartition": [
+                {
+                    "id": "network-partition-1",
+                    "partitionAlgo": "one-after-another",
+                    "partitions": [
+                        {
+                            "id": "partition-1",
+                            "max": 5
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/9f09f205/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
index dcbb13d..f98213a 100644
--- a/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
+++ b/samples/applications/single-cartridge/artifacts/openstack/deployment-policy.json
@@ -11,7 +11,7 @@
                         "property": [
                             {
                                 "name": "region",
-                                "value": "RegionOne"
+                                "value": "default"
                             }
                         ]
                     }
@@ -29,7 +29,7 @@
                     "partitions": [
                         {
                             "id": "partition-1",
-                            "max": 8
+                            "max": 5
                         }
                     ]
                 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/9f09f205/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh b/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh
index b9064e1..8341a0c 100755
--- a/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh
+++ b/samples/applications/single-cartridge/scripts/kubernetes/deploy.sh
@@ -6,6 +6,8 @@ iaas="kubernetes"
 
 prgdir=`dirname "$0"`
 script_path=`cd "$prgdir"; pwd`
+
+common_folder=`cd "${script_path}/../common"; pwd`
 iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
 
 echo "Adding kubernetes cluster..."


Mime
View raw message