From f65436041cf2f2560414b160d520b1f4dfef4bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Sat, 8 Oct 2011 18:25:59 +0200 Subject: [PATCH] Set connection dict in cubrid recipe --- slapos/recipe/cubrid/.__init__.py.swp | Bin 0 -> 16384 bytes slapos/recipe/cubrid/__init__.py | 15 ++++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 slapos/recipe/cubrid/.__init__.py.swp diff --git a/slapos/recipe/cubrid/.__init__.py.swp b/slapos/recipe/cubrid/.__init__.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..9ef7c2b461630b5e9a7ff1ba243699890eef7c4f GIT binary patch literal 16384 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 bi@JC@B1g4@rg=M-W8Y(DC&_N%U`yyfa8_i& literal 0 HcmV?d00001 diff --git a/slapos/recipe/cubrid/__init__.py b/slapos/recipe/cubrid/__init__.py index 5c1f30a27..4dda923d5 100644 --- a/slapos/recipe/cubrid/__init__.py +++ b/slapos/recipe/cubrid/__init__.py @@ -61,18 +61,19 @@ class Recipe(BaseSlapRecipe): cubrid_conf['cubrid_ip'], 12345, cubrid_conf['cubrid_port'], certificate, key, ca_conf['ca_crl'], ca_conf['certificate_authority_path']) - - self.setConnectionUrl(scheme='mysqls', - host=stunnel_conf['public_ip'], - port=stunnel_conf['public_port'], - #auth=(cubrid_conf['cubrid_user'], - # cubrid_conf['cubrid_password']), - path=cubrid_conf['cubrid_database']) + + self.setConnectionDict(dict( + stunnel_ip = stunnel_conf['public_ip'], + stunnel_port = stunnel_conf['public_port'], + database = cubrid_conf['cubrid_database'] + )) + return self.path_list def installCubrid(self, ip, port, database='db', user='user', template_filename=None, cubrid_conf=None): # XXX-Cedric : use work from Antoine to have backuped + generic cubrid + # XXX-Cedric : Check that running this recipe does not erase database config_dict = {} config_dict.update(self.options) -- 2.30.9