change amazon ami

update refs on submodule tomcat
qubell-bazaar · Apr 2, 2015 · f24ae34 · f24ae34
1 parent 640621b
commit f24ae34
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/meta.yml b/meta.yml
@@ -9,7 +9,7 @@ kit:
     - name: "Load Balancer"
       manifest: https://raw.github.com/qubell-bazaar/component-haproxy/1.0-34p/component-haproxy.yml
     - name: "Application Server"
-      manifest: https://raw.github.com/qubell-bazaar/component-tomcat-dev/1.0-34p/component-tomcat-dev.yml
+      manifest: https://raw.github.com/qubell-bazaar/component-tomcat-dev/1.2-38p/component-tomcat-dev.yml
   provider:
     name: "Qubell"
     link: http://qubell.com

diff --git a/starter-java-web.yml b/starter-java-web.yml
@@ -1,5 +1,6 @@
 application:
   configuration:
+    input.operating-system: {image: "us-east-1/ami-5ccae734", identity: ec2-user}
     input.lb-bucket: http://roundrobin:80
     input.app-fork: qubell
     input.app-branch: HEAD #red, master
@@ -16,6 +17,7 @@ application:
       app-branch: "bind(main.workflow#input.app-branch)"
       lb-bucket: "bind(main.workflow#input.lb-bucket)"
       app-quantity: "bind(AppServer#input.quantity)"
+      operating-system: "bind(Database#input.operating-system, AppServer#input.operating-system, LoadBalancer#input.operating-system)"
     app-meta:
       application-pic: "bind(metadata#output.application-pic)"
     endpoints:
@@ -44,8 +46,6 @@ application:
           type: workflow.Instance
           interfaces:
             input:
-              scm-provider:
-                  type: configuration(string)
               app-fork:
                   type: configuration(string)
                   name: Git fork
@@ -79,7 +79,7 @@ application:
                   type: send-command(object connection, list<string> sql-url)
             tomcat:
               build-app:
-                  type: send-command(string scm-provider, string git-uri, string app-branch => list<string> wars)
+                  type: send-command(string git-uri, string app-branch => list<string> wars)
               deploy-libs:
                   type: send-command(list<string> lib-uri)
               deploy-war:
@@ -109,7 +109,6 @@ application:
             input.db-user: petclinic #const
             input.db-password: petclinic #const
             input.privileges: ["all"] #const
-            input.scm-provider: git #const
             input.lib-uri: ["http://repo1.maven.org/maven2/org/apache/tomcat/dbcp/6.0.26/dbcp-6.0.26.jar", "http://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar", "https://dl.dropboxusercontent.com/u/250836/ojdbc6.jar"]
 
             configuration.triggers:
@@ -149,7 +148,6 @@ application:
                       precedingPhases: [ get-env-props ]
                       parameters:
                         commandCallTimeout: 10 minutes
-                        scm-provider: "{$.scm-provider}"
                         git-uri: "git://github.com/{$.app-fork}/starter-java-web.git"
                         app-branch: "{$.app-branch}"
                       output:
@@ -229,7 +227,6 @@ application:
                       precedingPhases: [ get-env-props ]
                       parameters:
                         commandCallTimeout: 10 minutes
-                        scm-provider: "{$.scm-provider}"
                         git-uri: "git://github.com/{$.app-fork}/starter-java-web.git"
                         app-branch: "{$.app-branch}"
                       output:
@@ -301,7 +298,6 @@ application:
                       precedingPhases: [ get-env-props ]
                       parameters:
                         commandCallTimeout: 10 minutes
-                        scm-provider: "{$.scm-provider}"
                         git-uri: "git://github.com/{$.app-fork}/starter-java-web.git"
                         app-branch: "{$.app-branch}"
                       output:
@@ -360,6 +356,13 @@ application:
         __locator.application-id: "Database"
       interfaces:
         input:
+          operating-system:
+             type: configuration(map<string,object>)
+             suggestions: # Create dropdown menu in advanced launch
+                 "centos": {image: "us-east-1/ami-bf5021d6", identity: root}
+                 "amazon": {image: "us-east-1/ami-5ccae734", identity: ec2-user}
+                 "ubuntu1204": {image: "us-east-1/ami-967edcff", identity: ubuntu}
+                 "ubuntu1004": {image: "us-east-1/ami-9f3906f6", identity: ubuntu}
           db-port:
               type: configuration(int)
               name: Database port
@@ -393,7 +396,7 @@ application:
               type: configuration(map<string,object>)
               suggestions:
                   "centos": {image: "us-east-1/ami-bf5021d6", identity: root}
-                  "amazon": {image: "us-east-1/ami-1ba18d72", identity: ec2-user}
+                  "amazon": {image: "us-east-1/ami-5ccae734", identity: ec2-user}
                   "ubuntu1204": {image: "us-east-1/ami-967edcff", identity: ubuntu}
                   "ubuntu1004": {image: "us-east-1/ami-9f3906f6", identity: ubuntu}
           instance-size:
@@ -404,7 +407,7 @@ application:
               name: No. application hosts
         tomcat:
           build-app:
-              type: receive-command(string scm-provider, string git-uri, string app-branch => list<string> wars)
+              type: receive-command(string git-uri, string app-branch => list<string> wars)
               name: Maven build
           deploy-libs:
               type: receive-command(list<string> lib-uri)
@@ -430,6 +433,14 @@ application:
       configuration:
         __locator.application-id: "Load Balancer"
       interfaces:
+        input:
+          operating-system:
+               type: configuration(map<string,object>)
+               suggestions: # Create dropdown menu in advanced launch
+                   "centos": {image: "us-east-1/ami-bf5021d6", identity: root}
+                   "amazon": {image: "us-east-1/ami-5ccae734", identity: ec2-user}
+                   "ubuntu1204": {image: "us-east-1/ami-967edcff", identity: ubuntu}
+                   "ubuntu1004": {image: "us-east-1/ami-9f3906f6", identity: ubuntu}
         haproxy:
           add-servers:
               type: receive-command(list<string> app-hosts, int app-port, string lb-bucket => string entry-url)

diff --git a/test/test.py b/test/test.py
@@ -76,11 +76,12 @@ def eventually_assert():
 })
 class PetClinicComponentTestCase(BaseComponentTestCase):
     name = "starter-java-web"
-    meta = "https://raw.githubusercontent.com/qubell-bazaar/starter-java-web/master/meta.yml"
+    meta = os.path.realpath(os.path.join(os.path.dirname(__file__), '../meta.yml')) 
     db_name = "petclinic"
+    destroy_interval = int(os.environ.get('DESTROY_INTERVAL', 1000*60*60*2))    
     apps = [{
         "name": name,
-        "settings": {"destroyInterval": 7200000},
+        "settings": {"destroyInterval": destroy_interval},
         "file": os.path.realpath(os.path.join(os.path.dirname(__file__), '../%s.yml' % name))
    }]
     @classmethod