x/snap.openstack
Code Issues Proposed changes

Add nginx entrypoint support

Browse Source 
Change-Id: Id1f11ea3ba3984407a32b1fee83d83dc59d1ad04
This commit is contained in:
Corey Bryant 2017-03-28 21:33:11 +00:00
parent 933f404664
commit 6898cb6c95
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
snap_openstack/base.py
View File

@ -40,13 +40,17 @@ SNAP_ENV = ['SNAP_NAME',
DEFAULT_EP_TYPE = 'simple'
UWSGI_EP_TYPE = 'uwsgi'
NGINX_EP_TYPE = 'nginx'
VALID_EP_TYPES = (DEFAULT_EP_TYPE, UWSGI_EP_TYPE)
VALID_EP_TYPES = (DEFAULT_EP_TYPE, UWSGI_EP_TYPE, NGINX_EP_TYPE)
DEFAULT_UWSGI_ARGS = ["--master",
"--die-on-term",
"--emperor"]
DEFAULT_NGINX_ARGS = ["-g",
"daemon on; master_process on;"]
def snap_env():
'''Grab SNAP* environment variables
@ -192,5 +196,18 @@ class OpenStackSnap(object):
log_file = log_file.format(**self.snap_env)
cmd.extend(['--logto', log_file])
elif cmd_type == NGINX_EP_TYPE:
cmd = [NGINX_EP_TYPE]
cmd.extend(DEFAULT_NGINX_ARGS)
cfile = entry_point.get('config-file')
if cfile:
cfile = cfile.format(**self.snap_env)
if os.path.exists(cfile):
cmd.extend(['-c', '{}'.format(cfile)])
else:
LOG.debug('Configuration file {} not found'
', skipping'.format(cfile))
LOG.debug('Executing command {}'.format(' '.join(cmd)))
os.execvp(cmd[0], cmd)