Skip to content

Commit

Permalink
Merge 49c448f into f51f154
Browse files Browse the repository at this point in the history
  • Loading branch information
lpramuk committed May 3, 2017
2 parents f51f154 + 49c448f commit e88d3c2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion robottelo.properties.sample
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ ssh_key=
# be pulled from there instead of using the CDN channel. These information is
# more suited to be used for downstream, downstream-iso and zstream builds.
# capsule_repo=http://capsule/repo
# sattools_repo=http://sattools/repo
# sattools_repo=
# rhel6=http://sattools/repo/el6,
# rhel7=http://sattools/repo/el7,


# For LDAP Authentication.
Expand Down
2 changes: 1 addition & 1 deletion robottelo/config/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ def _read_robottelo_settings(self):
self.rhel6_os = self.reader.get('robottelo', 'rhel6_os', None)
self.rhel7_os = self.reader.get('robottelo', 'rhel7_os', None)
self.sattools_repo = self.reader.get(
'robottelo', 'sattools_repo', None)
'robottelo', 'sattools_repo', None, dict)
self.screenshots_path = self.reader.get(
'robottelo', 'screenshots_path', '/tmp/robottelo/screenshots')
self.run_one_datapoint = self.reader.get(
Expand Down

0 comments on commit e88d3c2

Please sign in to comment.