From 51871a6722c0c83a7446347a81a54c7f5ea7e88d Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 7 Dec 2016 03:08:44 +0000 Subject: [PATCH] Use packaged docker-cmd hook in heat-agents Change-Id: I7562e57f62337d2d9a5f916d9d763596ad582ed7 --- heat_docker_agent/50-heat-config-docker-cmd | 144 -------------------- heat_docker_agent/Dockerfile | 2 - heat_docker_agent/configure_container.sh | 1 + heat_docker_agent/hook-docker-cmd.py | 139 ------------------- 4 files changed, 1 insertion(+), 285 deletions(-) delete mode 100755 heat_docker_agent/50-heat-config-docker-cmd delete mode 100755 heat_docker_agent/hook-docker-cmd.py diff --git a/heat_docker_agent/50-heat-config-docker-cmd b/heat_docker_agent/50-heat-config-docker-cmd deleted file mode 100755 index 246d86c94..000000000 --- a/heat_docker_agent/50-heat-config-docker-cmd +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/bin/env python -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import json -import logging -import os -import subprocess -import sys - -import yaml - - -CONF_FILE = os.environ.get('HEAT_SHELL_CONFIG', - '/var/run/heat-config/heat-config') - -WORKING_DIR = os.environ.get( - 'HEAT_DOCKER_CMD_WORKING', - '/var/lib/heat-config/heat-config-docker-cmd') - -DOCKER_CMD = os.environ.get('HEAT_DOCKER_CMD', 'docker') - - -log = None - - -def main(argv=sys.argv): - global log - log = logging.getLogger('heat-config') - handler = logging.StreamHandler(sys.stderr) - handler.setFormatter( - logging.Formatter( - '[%(asctime)s] (%(name)s) [%(levelname)s] %(message)s')) - log.addHandler(handler) - log.setLevel('DEBUG') - - if not os.path.exists(CONF_FILE): - log.error('No config file %s' % CONF_FILE) - return 1 - - if not os.path.isdir(WORKING_DIR): - os.makedirs(WORKING_DIR, 0o700) - - try: - configs = json.load(open(CONF_FILE)) - except ValueError: - pass - - cmd_configs = list(build_configs(configs)) - try: - delete_missing_projects(cmd_configs) - for c in cmd_configs: - delete_changed_project(c) - write_project(c) - except Exception as e: - log.exception(e) - - -def build_configs(configs): - for c in configs: - if c['group'] != 'docker-cmd': - continue - if not isinstance(c['config'], dict): - # convert config to dict - c['config'] = yaml.safe_load(c['config']) - yield c - - -def current_projects(): - for proj_file in os.listdir(WORKING_DIR): - if proj_file.endswith('.json'): - proj = proj_file[:-5] - yield proj - - -def remove_project(proj): - proj_file = os.path.join(WORKING_DIR, '%s.json' % proj) - with open(proj_file, 'r') as f: - proj_data = json.load(f) - for name in extract_container_names(proj, proj_data): - remove_container(name) - os.remove(proj_file) - - -def remove_container(name): - cmd = [DOCKER_CMD, 'rm', '-f', name] - log.debug(' '.join(cmd)) - subproc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - stdout, stderr = subproc.communicate() - log.info(stdout) - log.debug(stderr) - - -def delete_missing_projects(configs): - config_names = [c['name'] for c in configs] - for proj in current_projects(): - if proj not in config_names: - log.debug('%s no longer exists, deleting containers' % proj) - remove_project(proj) - - -def extract_container_names(proj, proj_data): - # For now, assume a docker-compose v1 format where the - # root keys are service names - for name in proj_data: - yield '%s__%s' % (proj, name) - - -def delete_changed_project(c): - proj = c['name'] - proj_file = os.path.join(WORKING_DIR, '%s.json' % proj) - proj_data = c.get('config', {}) - if os.path.isfile(proj_file): - with open(proj_file, 'r') as f: - prev_proj_data = json.load(f) - if proj_data != prev_proj_data: - log.debug('%s has changed, deleting containers' % proj) - remove_project(proj) - - -def write_project(c): - proj = c['name'] - proj_file = os.path.join(WORKING_DIR, '%s.json' % proj) - proj_data = c.get('config', {}) - - with os.fdopen(os.open( - proj_file, os.O_CREAT | os.O_WRONLY | os.O_TRUNC, 0o600), - 'w') as f: - json.dump(proj_data, f, indent=2) - - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/heat_docker_agent/Dockerfile b/heat_docker_agent/Dockerfile index ef566e9b3..05e31ade1 100644 --- a/heat_docker_agent/Dockerfile +++ b/heat_docker_agent/Dockerfile @@ -6,8 +6,6 @@ LABEL openstack_release=$OPENSTACK_RELEASE ENV container docker ENV DOCKER_HOST unix:///var/run/docker.sock -ADD hook-docker-cmd.py /usr/libexec/heat-config/hooks/docker-cmd -ADD 50-heat-config-docker-cmd /usr/libexec/os-refresh-config/configure.d/50-heat-config-hook-docker-cmd # Just use a script to configure the agent container. This way we can # Split up the operations and do it all in a single layer. ADD configure_container.sh /tmp/ diff --git a/heat_docker_agent/configure_container.sh b/heat_docker_agent/configure_container.sh index 0528e2ffa..45d86306b 100755 --- a/heat_docker_agent/configure_container.sh +++ b/heat_docker_agent/configure_container.sh @@ -40,6 +40,7 @@ yum install -y \ dhclient \ ethtool \ python-heat-agent-apply-config \ + python-heat-agent-docker-cmd \ python-heat-agent-hiera \ python-heat-agent-puppet \ python-ipaddr \ diff --git a/heat_docker_agent/hook-docker-cmd.py b/heat_docker_agent/hook-docker-cmd.py deleted file mode 100755 index a653f86a1..000000000 --- a/heat_docker_agent/hook-docker-cmd.py +++ /dev/null @@ -1,139 +0,0 @@ -#!/usr/bin/env python -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import json -import logging -import os -import subprocess -import sys -import yaml - -import six - -DOCKER_CMD = os.environ.get('HEAT_DOCKER_CMD', 'docker') - - -log = None - - -def build_response(deploy_stdout, deploy_stderr, deploy_status_code): - return { - 'deploy_stdout': deploy_stdout, - 'deploy_stderr': deploy_stderr, - 'deploy_status_code': deploy_status_code, - } - - -def docker_arg_map(key, value): - value = str(value).encode('ascii', 'ignore') - return { - 'container_step_config': None, - 'environment': "--env=%s" % value, - 'image': value, - 'net': "--net=%s" % value, - 'pid': "--pid=%s" % value, - 'privileged': "--privileged=%s" % 'true' if value else 'false', - 'restart': "--restart=%s" % value, - 'user': "--user=%s" % value, - 'volumes': "--volume=%s" % value, - 'volumes_from': "--volumes-from=%s" % value, - }.get(key, None) - - -def main(argv=sys.argv): - global log - log = logging.getLogger('heat-config') - handler = logging.StreamHandler(sys.stderr) - handler.setFormatter( - logging.Formatter( - '[%(asctime)s] (%(name)s) [%(levelname)s] %(message)s')) - log.addHandler(handler) - log.setLevel('DEBUG') - - c = json.load(sys.stdin) - - input_values = dict((i['name'], i['value']) for i in c.get('inputs', {})) - - if input_values.get('deploy_action') == 'DELETE': - json.dump(build_response( - '', '', 0), sys.stdout) - return - - config = c.get('config', '') - if not config: - log.debug("No 'config' input found, nothing to do.") - json.dump(build_response( - '', '', 0), sys.stdout) - return - - stdout = [] - stderr = [] - deploy_status_code = 0 - - # convert config to dict - if not isinstance(config, dict): - config = yaml.safe_load(config) - - for container in config: - container_name = '%s__%s' % (c['name'], container) - cmd = [ - DOCKER_CMD, - 'run', - '--detach=true', - '--name', - container_name.encode('ascii', 'ignore'), - ] - image_name = '' - for key in sorted(config[container]): - # These ones contain a list of values - if key in ['environment', 'volumes', 'volumes_from']: - for value in config[container][key]: - # Somehow the lists get empty values sometimes - if type(value) is six.text_type and not value.strip(): - continue - cmd.append(docker_arg_map(key, value)) - elif key == 'image': - image_name = config[container][key].encode('ascii', 'ignore') - else: - arg = docker_arg_map(key, config[container][key]) - if arg: - cmd.append(arg) - - # Image name must come last. - cmd.append(image_name) - - log.debug(' '.join(cmd)) - subproc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - cmd_stdout, cmd_stderr = subproc.communicate() - log.debug(cmd_stdout) - log.debug(cmd_stderr) - if cmd_stdout: - stdout.append(cmd_stdout) - if cmd_stderr: - stderr.append(cmd_stderr) - - if subproc.returncode: - log.error("Error running %s. [%s]\n" % (cmd, subproc.returncode)) - else: - log.debug('Completed %s' % cmd) - - if subproc.returncode != 0: - deploy_status_code = subproc.returncode - - json.dump(build_response( - '\n'.join(stdout), '\n'.join(stderr), deploy_status_code), sys.stdout) - -if __name__ == '__main__': - sys.exit(main(sys.argv))