From d74f1c17a9cef7a5b2343589795c8e331557a9c9 Mon Sep 17 00:00:00 2001 From: Artem Ivantsov Date: Wed, 25 Mar 2015 15:47:00 +0200 Subject: [PATCH] change amazon ami update refs on submodule tomcat --- meta.yml | 2 +- starter-java-web.yml | 29 ++++++++++++++++++++--------- test/test.py | 2 +- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/meta.yml b/meta.yml index 4eb19e7..a8708e3 100644 --- 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 index 42f6e5e..9076c44 100644 --- 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 sql-url) tomcat: build-app: - type: send-command(string scm-provider, string git-uri, string app-branch => list wars) + type: send-command(string git-uri, string app-branch => list wars) deploy-libs: type: send-command(list 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) + 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) 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 wars) + type: receive-command(string git-uri, string app-branch => list wars) name: Maven build deploy-libs: type: receive-command(list lib-uri) @@ -430,6 +433,14 @@ application: configuration: __locator.application-id: "Load Balancer" interfaces: + input: + operating-system: + type: configuration(map) + 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 app-hosts, int app-port, string lb-bucket => string entry-url) diff --git a/test/test.py b/test/test.py index c6e0450..1c7ebbe 100644 --- a/test/test.py +++ b/test/test.py @@ -76,7 +76,7 @@ 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" apps = [{ "name": name,