From c59dcefa57c5176de527607bbdf04f1db5ca6ebb Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Wed, 6 Jul 2016 15:19:53 +0300 Subject: [PATCH] Initial implementation of etcd image Change-Id: Ic9229c3ddd48e590b72abbe9cdab30e29a7aa94c --- .gitignore | 70 ++++++++++++++++++++++++++++++++++ docker/etcd/Dockerfile.j2 | 9 +++++ service/etcd.yaml | 14 +++++++ service/files/defaults.yaml | 6 +++ tools/run-check-yaml-syntax.sh | 7 ++++ tox.ini | 9 +++++ 6 files changed, 115 insertions(+) create mode 100644 .gitignore create mode 100644 docker/etcd/Dockerfile.j2 create mode 100644 service/etcd.yaml create mode 100644 service/files/defaults.yaml create mode 100755 tools/run-check-yaml-syntax.sh create mode 100644 tox.ini diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9417f86 --- /dev/null +++ b/.gitignore @@ -0,0 +1,70 @@ +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +.eggs +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +cover +.tox +nosetests.xml +.testrepository +.venv + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Complexity +output/*.html +output/*/index.html + +# Sphinx +doc/build + +# oslo-config-generator +etc/*.sample + +# pbr generates these +AUTHORS +ChangeLog + +# Editors +*~ +.*.swp +.*sw? + +# Vagrant +.vagrant +vagrant/Vagrantfile.custom +vagrant/vagrantkey* + +# generated openrc +openrc + +# tests +tests/.cache/* + diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 new file mode 100644 index 0000000..ff3c032 --- /dev/null +++ b/docker/etcd/Dockerfile.j2 @@ -0,0 +1,9 @@ +FROM {{ namespace }}/base-tools:{{ tag }} +MAINTAINER {{ maintainer }} + +RUN curl -L -o etcd-{{ etcd_version }}-linux-amd64.tar.gz https://github.com/coreos/etcd/releases/download/{{ etcd_version }}/etcd-{{ etcd_version }}-linux-amd64.tar.gz \ + && tar -zxvf etcd-{{ etcd_version }}-linux-amd64.tar.gz \ + && mv etcd-{{ etcd_version }}-linux-amd64/etcd /usr/local/bin \ + && mkdir -p /var/etcd/ \ + && rm -r etcd-{{ etcd_version }}-linux-amd64 \ + && rm etcd-{{ etcd_version }}-linux-amd64.tar.gz diff --git a/service/etcd.yaml b/service/etcd.yaml new file mode 100644 index 0000000..6cbfc3f --- /dev/null +++ b/service/etcd.yaml @@ -0,0 +1,14 @@ +service: + name: etcd + ports: + - etcd_client_port + - etcd_server_port + containers: + - name: etcd + image: etcd + probes: + readiness: "true" + liveness: "true" + daemon: + command: etcd --listen-client-urls http://0.0.0.0:{{ etcd_client_port }} + --advertise-client-urls http://0.0.0.0:{{ etcd_server_port }} diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml new file mode 100644 index 0000000..42b3e96 --- /dev/null +++ b/service/files/defaults.yaml @@ -0,0 +1,6 @@ +configs: + etcd_client_port: 2379 + etcd_server_port: 2380 + +versions: + etcd_version: v3.0.1 diff --git a/tools/run-check-yaml-syntax.sh b/tools/run-check-yaml-syntax.sh new file mode 100755 index 0000000..e393c54 --- /dev/null +++ b/tools/run-check-yaml-syntax.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +### Temp yaml syntax checker script. +set -e +for file in $(find . -name '*.yaml'); do + yamllint -d relaxed $file +done diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..d6f485a --- /dev/null +++ b/tox.ini @@ -0,0 +1,9 @@ +[tox] +minversion = 1.6 +envlist = linters +skipsdist = True + +[testenv:linters] +deps = yamllint +commands = + {toxinidir}/tools/run-check-yaml-syntax.sh