-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[dsfm-client]: updated auth url for prod.
- Loading branch information
Showing
1 changed file
with
9 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -180,7 +180,14 @@ def __init__(self, apikey, instance_crn, stunnel_conf_path, dsfm_setup_url): | |
self.user_agent = 'Data Store for Memcache client' | ||
#self.request_headers.add('User-Agent', self.user_agent) | ||
self.stunnel_path = stunnel_conf_path | ||
self.dsfm_setup_url = dsfm_setup_url | ||
try: | ||
crn = instance_crn.replace('%3A', ':') | ||
if crn.split(':')[2] == 'staging': | ||
self.dsfm_setup_url = 'https://dsfm.stage1.mybluemix.net/auth/instance' | ||
else: | ||
self.dsfm_setup_url = 'https://dsfm.mybluemix.net/auth/instance' | ||
except Exception: | ||
self.dsfm_setup_url = dsfm_setup_url | ||
self.access_token = '' | ||
self.logged_in = False | ||
|
||
|
@@ -425,7 +432,7 @@ def cleanup(args): | |
parser.add_argument('--apikey', help='Bluemix account api key', required=True) | ||
parser.add_argument('--instance_crn', help='Bluemix service instance crn', | ||
default='crn%3Av1%3Abluemix%3Apublic%3Adata-store-for-memcache%3Aus-south%3Aa%2Ftest-test-01') | ||
parser.add_argument('--dsfm_setup_url', default = 'https://dsfm.stage1.mybluemix.net/auth/instance', help='URL for service setup') | ||
parser.add_argument('--dsfm_setup_url', default = 'https://dsfm.mybluemix.net/auth/instance', help='URL for service setup') | ||
parser.add_argument('--stunnel_conf_path', default = os.path.join(os.environ['HOME'], '.stunnel'), help='path for stunnel setup files') | ||
parser.add_argument('--email', default = '[email protected]', help='client email') | ||
parser.add_argument('--ssl_subject', default = '/C=US/ST=TX/L=Dallas/O=Client/CN=client.com', help='client ssl info') | ||
|