Add ssh key to config file
Using daemonContext requires a full path for all files that are opened. So this adds the ssh key to the config file to ensure that the irc bot can find the right key.
This commit is contained in:
parent
4ede959655
commit
fce600e64c
8
bot.py
8
bot.py
|
@ -82,7 +82,7 @@ class RecheckWatchBot(irc.bot.SingleServerIRCBot):
|
|||
|
||||
|
||||
class RecheckWatch(threading.Thread):
|
||||
def __init__(self, ircbot, channel_config, username, queries, host):
|
||||
def __init__(self, ircbot, channel_config, username, queries, host, key):
|
||||
threading.Thread.__init__(self)
|
||||
self.ircbot = ircbot
|
||||
self.channel_config = channel_config
|
||||
|
@ -91,6 +91,7 @@ class RecheckWatch(threading.Thread):
|
|||
self.queries = queries
|
||||
self.host = host
|
||||
self.connected = False
|
||||
self.key = key
|
||||
|
||||
def new_error(self, channel, data):
|
||||
msg = '%s change: %s failed tempest with an unrecognized error' % (
|
||||
|
@ -119,7 +120,7 @@ class RecheckWatch(threading.Thread):
|
|||
|
||||
def run(self):
|
||||
classifier = Classifier(self.queries)
|
||||
stream = Stream(self.username, self.host)
|
||||
stream = Stream(self.username, self.host, self.key)
|
||||
while True:
|
||||
event = stream.get_failed_tempest()
|
||||
change = event['change']['number']
|
||||
|
@ -176,7 +177,8 @@ def _main():
|
|||
recheck = RecheckWatch(bot, channel_config,
|
||||
config.get('gerrit', 'user'),
|
||||
config.get('gerrit', 'query_file'),
|
||||
config.get('gerrit', 'host', 'review.openstack.org'))
|
||||
config.get('gerrit', 'host', 'review.openstack.org'),
|
||||
config.get('gerrit', 'key'))
|
||||
|
||||
recheck.start()
|
||||
bot.start()
|
||||
|
|
|
@ -8,4 +8,6 @@ channel_config=/home/mtreinish/elasticRecheck/recheckwatchbot.yaml
|
|||
|
||||
[gerrit]
|
||||
user=treinish
|
||||
host=review.openstack.org
|
||||
query_file=/home/mtreinish/elasticRecheck/queries.json
|
||||
key=/home/mtreinish/.ssh/id_rsa.pub
|
||||
|
|
|
@ -34,9 +34,9 @@ class Stream(object):
|
|||
Monitors gerrit stream looking for tempest-devstack failures.
|
||||
"""
|
||||
|
||||
def __init__(self, user, host, thread=True):
|
||||
def __init__(self, user, host, key, thread=True):
|
||||
port = 29418
|
||||
self.gerrit = gerritlib.gerrit.Gerrit(host, user, port)
|
||||
self.gerrit = gerritlib.gerrit.Gerrit(host, user, port, key)
|
||||
if thread:
|
||||
self.gerrit.startWatching()
|
||||
|
||||
|
@ -249,8 +249,9 @@ def main():
|
|||
user = config.get('gerrit', 'user', 'jogo')
|
||||
host = config.get('gerrit', 'host', 'review.openstack.org')
|
||||
queries = config.get('gerrit', 'query_file', 'queries.json')
|
||||
key = config.get('gerrit', 'key')
|
||||
classifier = Classifier(queries)
|
||||
stream = Stream(user, host)
|
||||
stream = Stream(user, host, key)
|
||||
while True:
|
||||
event = stream.get_failed_tempest()
|
||||
change = event['change']['number']
|
||||
|
|
Loading…
Reference in New Issue