cloudstore-developers
Changes
.gitignore 1(+1 -0)
bin/config.aws.ini 2(+1 -1)
bin/config.openstack.mongo.ini 27(+27 -0)
bin/config.openstack.mysql.ini 5(+1 -4)
bin/run.py 9(+6 -3)
Details
.gitignore 1(+1 -0)
diff --git a/.gitignore b/.gitignore
index 7d3fbd9..3c7fb52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ dist/cloudscale-deployment-scripts-0.1.0
build
dist
deployment_scripts.log
+results/
\ No newline at end of file
bin/config.aws.ini 2(+1 -1)
diff --git a/bin/config.aws.ini b/bin/config.aws.ini
index e4f61c3..c4dec3b 100644
--- a/bin/config.aws.ini
+++ b/bin/config.aws.ini
@@ -26,7 +26,7 @@ replica_identifier = cloudscale-replica
[EC2]
instance_type = t2.small
-ami_id = ami-4d5bd93a
+ami_id = ami-bd64ffca
key_name = cloudscale
key_pair = <auto-generated>
remote_user = ubuntu
bin/config.openstack.mongo.ini 27(+27 -0)
diff --git a/bin/config.openstack.mongo.ini b/bin/config.openstack.mongo.ini
new file mode 100644
index 0000000..1ecba3b
--- /dev/null
+++ b/bin/config.openstack.mongo.ini
@@ -0,0 +1,27 @@
+[OPENSTACK]
+username = <your username>
+password = <your password>
+tenant_name = cloudscale
+auth_url = http://localhost:5000/v2.0
+key_name = key-pair
+key_pair = key_pair
+
+[APPLICATION]
+num_instances = 2
+image_name = Ubuntu 14.04
+image_username = xlab
+instance_type = 2GB-2CPU-10GB
+
+[DATABASE]
+database_type = mongo
+database_name = tpcw
+database_user = root
+database_pass = password
+instance_type = flavor 2
+num_replicas = 5
+connection_pool_size = 200
+
+[MONGODB]
+dump_url = http://cloudscale.xlab.si/showcase/dumps/mongo-dump-tpcw-latest.tar.gz
+image_name = cloudscale-db-mongo-image
+showcase_url = http://cloudscale.xlab.si/showcase/builds/showcaseV3-nosql.war
\ No newline at end of file
bin/run.py 9(+6 -3)
diff --git a/bin/run.py b/bin/run.py
index d7ac0a2..f442ad3 100644
--- a/bin/run.py
+++ b/bin/run.py
@@ -15,7 +15,10 @@ if __name__ == "__main__":
config_path = sys.argv[2]
infrastructure = sys.argv[1]
logger = MyLogger()
- url = deploy(infrastructure, config_path, os.path.abspath(os.path.dirname(__file__)), logger)
- print "Showcase is deployed on %s" % url
+ results_dir = "%s/results" % os.path.abspath(os.path.dirname(__file__))
+ url = deploy(infrastructure, config_path, results_dir, logger)
+ print "Showcase is deployed on http://%s/showcase-1-a\n" \
+ "\n" \
+ "NOTE: You can copy above url to our application for distributed jmeter" % url
else:
- print """Usage: python run.py <aws|openstack> <path_to_config>"""
\ No newline at end of file
+ print """Usage: python run.py <aws|openstack> <path_to_config>"""
diff --git a/cloudscale/deployment_scripts/frontend.py b/cloudscale/deployment_scripts/frontend.py
index c0da0a7..6c034cf 100644
--- a/cloudscale/deployment_scripts/frontend.py
+++ b/cloudscale/deployment_scripts/frontend.py
@@ -16,6 +16,7 @@ class Frontend(AWSConfig):
def __init__(self, config, logger):
AWSConfig.__init__(self, config, logger)
+
self.instance_ids = []
self.ip_addresses = []
@@ -25,8 +26,6 @@ class Frontend(AWSConfig):
self.deploy_name = "showcase-1-a"
def setup_aws_frontend(self):
- self.cfg = self.config.cfg
- self.config = self.config
i = aws_create_keypair.CreateKeyPair(
config=self.config,