Skip to content

Commit

Permalink
Merge pull request #20981 from cbodley/wip-qa-fix-ssl
Browse files Browse the repository at this point in the history
qa: fix overrides for openssl_keys task

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
  • Loading branch information
yuriw committed Mar 23, 2018
2 parents 2a0bb28 + cfe4ba6 commit 6a5bab7
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions qa/tasks/openssl_keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@

log = logging.getLogger(__name__)

class SSL(Task):
class OpenSSLKeys(Task):
name = 'openssl_keys'
"""
Generates and installs a signed SSL certificate.
To create a self-signed certificate:
- ssl:
- openssl_keys:
# certificate name
root: # results in root.key and root.crt
Expand All @@ -37,7 +38,7 @@ class SSL(Task):
To create a certificate signed by a ca certificate:
- ssl:
- openssl_keys:
root: (self-signed certificate as above)
...
Expand All @@ -52,7 +53,7 @@ class SSL(Task):
"""

def __init__(self, ctx, config):
super(SSL, self).__init__(ctx, config)
super(OpenSSLKeys, self).__init__(ctx, config)
self.certs = []
self.installed = []

Expand Down Expand Up @@ -222,4 +223,4 @@ def remote_copy_file(self, from_remote, from_path, to_remote, to_path):
finally:
os.remove(local_path)

task = SSL
task = OpenSSLKeys

0 comments on commit 6a5bab7

Please sign in to comment.