X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=system%2Fconfig_default.py;h=0bab5106833f6ddddc072963fe201add2993d73f;hb=50ca8efbdbf5844df47eb0edecf84c74f6037164;hp=96c1ec96bf3eb33c3428e8eb5e7d99dc2ce0437d;hpb=7e091116edb3263daceb18ef3ae3467999184722;p=tests.git diff --git a/system/config_default.py b/system/config_default.py index 96c1ec9..0bab510 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -307,12 +307,8 @@ def sfa (options,index) : 'SFA_PLC_URL' : 'deferred-myplc-api-url', 'SFA_PLC_USER' : 'root@test.onelab.eu', 'SFA_PLC_PASSWORD' : 'test++', - 'SFA_DB_HOST':'deferred-myplc-hostname', - 'SFA_DB_USER' : 'pgsqluser', -# 'SFA_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq', -# the default settings come with 'sfa' as the dbname -# temporary until we get the initscript to create that one -# 'SFA_DB_NAME' : 'sfa', +# use -c apiv2 to override this one +# 'SFA_AGGREGATE_API_VERSION' : 1, 'SFA_API_DEBUG': True, # details of the slices to create 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style) @@ -336,7 +332,7 @@ def sfa_slice_spec (options,index,rspec_style): print 'in sfa_slice_spec','slicename',slicename,'hrn',hrn,'mail',mail key=public_key slice_person_xml =''' +last_name="Sfa %(rspec_style)s" name="%(hrn)s" type="user"> %(key)s2010 1piadmin%(prefix)s'''%locals()