oslo messenger warns of possible hang with wait()

- oslo messager warns of hang while using wait() after a start
  in ord/engine/app.py.
  Documantation [0] shows wait is used after the stop method.

- 'BaseException.message has been deprecated' warning resolved
  in ord/common/utils.py

- Add switch for RDS api check (True/False)

- Update Docker file

- Create key and config for access to github.com repo:
  https://github.com/ranger-agent/templates

[0]
docs.openstack.org/oslo.messaging/latest/reference/server.html

Change-Id: I60a65bb4f7c017ed4258c0b0cc5602397c19b930
This commit is contained in:
MikeG451 2018-02-28 18:59:15 -06:00 committed by Michael Glaser
parent 797ccc5bb8
commit 89eec6d356
6 changed files with 57 additions and 11 deletions

View File

@ -41,17 +41,21 @@ RUN pip install --default-timeout=100 -r requirements.txt
RUN python setup.py install
RUN cd ~/ \
&& rm -fr /tmp/ranger-agent \
&& mkdir /var/log/ranger-agent
# Create user ranger_agent
RUN useradd -u 1000 -ms /bin/bash ranger_agent
# Change permissions
RUN chown -R ranger_agent: /home/ranger_agent \
&& chown -R ranger_agent: /etc/ranger-agent \
&& chown -R ranger_agent: /var/log/ranger-agent
&& mkdir /var/log/ranger-agent \
&& chown -R ranger_agent: /var/log/ranger-agent \
&& cp -fr tools/.ssh /home/ranger_agent/ \
&& chown -R ranger_agent: /home/ranger_agent/.ssh \
&& chmod 700 -R /home/ranger_agent/.ssh \
&& chmod 644 /home/ranger_agent/.ssh/config \
&& chmod 600 /home/ranger_agent/.ssh/ranger_agent \
&& cd ~/ \
&& rm -fr /tmp/ranger-agent
# Set work directory
USER ranger_agent

View File

@ -32,15 +32,16 @@ project_name = service
region_name = RegionOne
user_domain_name = Default
username = admin
i
[database]
connection = mysql+pymysql://root:devstack@127.0.0.1:3306/ord
max_retries = -1
[orm]
#This will assume the required ssh-keys are all already populated
orm_template_repo_url = ssh://git@127.0.0.1:/home/repo/ranger_repo.git
orm_template_repo_url = git@github.com:ranger-agent/templates.git
#This is fake service call will be replaced with rds url
rds_listener_endpoint = http://127.0.0.1:8777/v1/rds/status
enable_rds_callback_check = True
repo_pull_check_wait = 2
retry_limits = 5

View File

@ -44,7 +44,7 @@ def load_file(name):
payload = fd.read()
except IOError as e:
raise exc.InternalError(
'Can\'t load {!r}: {}'.format(e.filename, e.message))
'Can\'t load {!r}: {}'.format(e.filename, e.errno))
return payload

View File

@ -15,8 +15,13 @@
from ord.engine.engine import Engine
from ord.engine.engine import QueueHandler
from ord.openstack.common import log as logging
from oslo_config import cfg
import oslo_messaging as messaging
import time
LOG = logging.getLogger(__name__)
def start():
@ -36,7 +41,11 @@ def start():
try:
server.start()
server.wait()
LOG.info("Messaging engine started")
while True:
time.sleep(1)
except KeyboardInterrupt:
# Add termination handling here
pass
LOG.info("Messaging engine stopped with ctrl-c")
server.stop()
server.wait()

4
tools/.ssh/config Normal file
View File

@ -0,0 +1,4 @@
Host github.com
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
IdentityFile /home/ranger_agent/.ssh/ranger_agent

28
tools/.ssh/ranger_agent Normal file
View File

@ -0,0 +1,28 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEogIBAAKCAQEAxo+hfgK/+zY+xp+tjxbkLhLP2ehEq6VHoF8owLU7RPe/QFqg
7uuUnbsdOzsmFDUU0YooioHiogtiX0fl5QlLrlo/ehLBcgrus6UuTmZ2bRO+Glib
mq8sMnsv0O7QcVyC2No/n+nicyeGU6ZepY+gn0XbvDX42apGGgoxMZWu7xrQm38c
LciIUkKb88NN5SBPEXtfrc5TzFS4B26hsvB4PVjxHTYeMHUryWxKo2E6ib1NR9fM
kxqogw+YRzInaAl/PYRkDWLIZJAANa7Si9fYwU20kMC+sfjFLvHWivI+/0eEVD2A
ttPBgu+4uYRLkdm4lsHh84oFOMmb0MQIvMdG0wIDAQABAoIBAEDEXvfca8TEZ+uf
8BvpapqAtl2svqGCcv+jqoZZVzDi4vZZ2X61Ry+/9gP5Ai27NsQ2nYy4WzViIz9T
E3EG/DGt7GCkN4c8e6oLajRWhbCErRCo8HCfTPpWZj1veHxRobicT/6Yaq4HKXCl
pt+4Hrt1LPySWk6dlOovguZancoN0NoWykd2zdsvzPFcWKArnwz3uwsnQz+0zCGb
4NF36WDp1NsW13Na2+C7pxltQjtf4mpWVnPcEe0F/7X1Y4Rdc5mdtGGWPRfib499
EAE8fsv1e7MxoIb9sisN2pyJENWDXAwjqW4YOSgM9tpwOzGeRJrPXTWFFN7T9cOy
FgcUj6kCgYEA7CD9BsLv0baKkZVoAMVmL3QF8e8wO3uqoplzpoaOwFZvrvEmdxMf
H4vACR1Putb0ZDfhbsqFFDkAB6FUnMaLrDifI7Sx+IsrXoM6AjMWssa2IAN1Ra/f
+QLwSmLMkL8mEbKx6VnWbEIuwE4O4gISuhmfq4q0KsI9QaykeW6I4C0CgYEA10VO
Kl8V6ovLrcKcqeRQTjFSmpUMBm+h6AmjPl0Z6kjztDESDauZ6P1uFMtXnpBIM0u2
BknLJe8ermhSefnStPvZse4yfH+SEsIyVP7fWaK8kI5VMCp2q+akzSSkaa8Uy4HT
YKNfqSZh38sYCCqy3FJhq6CBhG6ojyw1YeeSIv8CgYBlgrEEDR2oHD9p4r75ReNu
FwTPQzKK/9kVWb68IjCQQxh0LruIiTHiD+QYhv9VpT8fLl69kFaxoOeAYDzNwRUe
jqDraqzv2nRkhymS9H+Xj5GQJaxurvMsS7UdZWfn+iTViuqtFK/3jmQmy+feBWIj
mwxnZJObpjFLYHq8sWYqaQKBgD1A4zT7SWkrzhDrR1iwNomJT0/dCUbrjM5Rr7mX
FECt8WpcbB6nrWu2cRRJp+zecSznZivz43Iv0DMgTBeZFnOZFiCi/oqeYhokV94H
h9YhkDYxyduiuZHAVzRoMMBBqVEe596fniCrYz4is/ve6nX2mwQS78eXFS9oDOiG
0/ZRAoGAaaIJDnztjInY585Mv4Ht0CljUkFak/JZ6seCK9Mu5pcPX2oJlUH2BwwG
eI7Z3kEtDo+QOmB7t/79lGrbAFjBrMV6LLhoV2lTTNF5+oLHU+N1Y5ehf1rl1A/S
oT03gE3qSpWgkCSLqZ5uPTU2OOM9fYBlp9uZTLx51ijFVIVsJ+w=
-----END RSA PRIVATE KEY-----