Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added unccommited file. #542

Merged
merged 30 commits into from
Oct 1, 2019
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
95aab45
Updated documentation
seriva Jul 31, 2019
601c62a
Fixed links.
seriva Jul 31, 2019
a4c9065
Fixed changelog.
seriva Jul 31, 2019
044bcf9
Merge branch 'develop' into develop
seriva Jul 31, 2019
1a1365c
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 1, 2019
e94b678
Added node_exporter port known issue.
seriva Aug 1, 2019
b914eef
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 2, 2019
8528f8d
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 5, 2019
60d2f96
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 8, 2019
d790b86
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 9, 2019
ed3c8e1
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 9, 2019
0f7b6f4
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 12, 2019
d816883
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 14, 2019
a47abd0
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 14, 2019
81a8411
Merge remote-tracking branch 'upstream/develop' into develop
seriva Aug 26, 2019
b50ca37
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 3, 2019
ebbeb93
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 9, 2019
8210ba9
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 10, 2019
4555ba9
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 12, 2019
c3589f9
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 17, 2019
60c6949
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 20, 2019
c2df9f6
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 24, 2019
61fc6bc
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 26, 2019
531866c
Merge remote-tracking branch 'upstream/develop' into develop
seriva Sep 30, 2019
d678990
Fixes for SP login.
seriva Sep 30, 2019
8dbdfb3
Fixed exit code issue with Ansible.
seriva Sep 30, 2019
11bb14d
Fixed break.
seriva Sep 30, 2019
7a466d4
Commit forgotten file.
seriva Oct 1, 2019
0108c73
Merge remote-tracking branch 'upstream/develop' into develop
seriva Oct 1, 2019
dd0bc03
Bumped wait time to fix timeout issue.
seriva Oct 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions core/src/epicli/cli/engine/providers/azure/APIProxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ def login_account(self):
return subscription

def login_sp(self, sp_data):
return self.run(self, f'az login --service-principal -u {sp_data.name} -p {sp_data.password} --tenant {sp_data.tenant}')
name = sp_data['name']
password = sp_data['password']
tenant = sp_data['tenant']
return self.run(self, f'az login --service-principal -u {name} -p {password} --tenant {tenant}')

def set_active_subscribtion(self, subscription_id):
self.run(self, f'az account set --subscription {subscription_id}')
Expand All @@ -44,7 +47,7 @@ def create_sp(self, app_name, subscription_id):
#TODO: make role configurable?
sp = self.run(self, f'az ad sp create-for-rbac -n "{app_name}" --role="Contributor" --scopes="/subscriptions/{subscription_id}"')
# Sleep for a while. Sometimes the call returns before the rights of the SP are finished creating.
self.wait(self, 20)
self.wait(self, 60)
return sp

def get_ips_for_feature(self, component_key):
Expand Down