Skip to content

Commit

Permalink
Git checks fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jyejare committed Jun 13, 2024
1 parent 3a63b78 commit b27a4d0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions conf/server.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ SERVER:
# The RHEL Base OS Version(x.y) where the Satellite is installed
RHEL_VERSION: '7'
# If the the satellite server is IPv6 server
# IS_IPV6:
IS_IPV6: False
# HTTP Proxy url for IPv6 satellite to connect for outer world access
# HTTP_PROXY_IPv6_URL:
HTTP_PROXY_IPv6_URL:
# run-on-one - All xdist runners default to the first satellite
# balance - xdist runners will be split between available satellites
# on-demand - any xdist runner without a satellite will have a new one provisioned.
Expand Down
5 changes: 3 additions & 2 deletions pytest_fixtures/core/broker.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def _target_sat_imp(request, _default_sat, satellite_factory):
"""This is the actual working part of the following target_sat fixtures"""
if request.node.get_closest_marker(name='destructive'):
new_sat = satellite_factory()
new_sat.sat.enable_ipv6_http_proxy()
new_sat.enable_ipv6_http_proxy()
yield new_sat
new_sat.teardown()
Broker(hosts=[new_sat]).checkin()
Expand All @@ -33,7 +33,8 @@ def _target_sat_imp(request, _default_sat, satellite_factory):
settings.set('server.hostname', installer_sat.hostname)
yield installer_sat
else:
_default_sat.enable_ipv6_http_proxy()
if _default_sat:
_default_sat.enable_ipv6_http_proxy()
yield _default_sat


Expand Down
2 changes: 1 addition & 1 deletion robottelo/config/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
Validator('server.ssh_password', default=None),
Validator('server.verify_ca', default=False),
Validator('server.is_ipv6', is_type_of=bool, default=False),
Validator('server.http_proxy_ipv6_url', is_type_of=str),
Validator('server.http_proxy_ipv6_url', is_type_of=str, default=None),
],
content_host=[
Validator('content_host.default_rhel_version', must_exist=True),
Expand Down

0 comments on commit b27a4d0

Please sign in to comment.