fixed cdg stack

elodina · May 20, 2016 · 011a951 · 011a951
1 parent 8e37275
commit 011a951
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cdg.stack b/cdg.stack
@@ -10,7 +10,8 @@ applications:
     env:
       CDG_CASSANDRA_HOSTS: "cdg-cassandra.service"
       CDG_CASSANDRA_PORT: "9042"
-      CDG_CASSANDRA_PROTOCOL: "4"
+      CDG_CASSANDRA_PROTOCOL_VERSION: "4"
+      CDG_CASSANDRA_CQL_VERSION: "3.0.0"
     launch_command: "eval `ssh-agent -s`; sleep 60; /usr/bin/python2 main.py"
     docker:
       network: HOST

diff --git a/gridapi/resources/models.py b/gridapi/resources/models.py
@@ -8,7 +8,8 @@
 
 cassandra_hosts = os.getenv('CDG_CASSANDRA_HOSTS', '127.0.0.1').split(',')
 cassandra_port = os.getenv('CDG_CASSANDRA_PORT', '9042')
-cassandra_protocol = int(os.getenv('CDG_CASSANDRA_PROTOCOL', '4'))
+cassandra_protocol = int(os.getenv('CDG_CASSANDRA_PROTOCOL_VERSION', '4'))
+cassandra_protocol = os.getenv('CDG_CASSANDRA_CQL_VERSION', None)
 
 connection.setup(cassandra_hosts, 'grids', protocol_version=cassandra_protocol, port=cassandra_port)