Merge "Remove salt-master, reclass from pkg dependencis"
diff --git a/README.rst b/README.rst
index 3e155d6..e741ac8 100644
--- a/README.rst
+++ b/README.rst
@@ -17,6 +17,11 @@
tftpd_hpa:
server:
enabled: true
+ username: 'tftp'
+ path: '/var/lib/tftproot'
+ options:
+ - secure
+ - map-file: '/var/lib/tftproot/map-file'
More information
diff --git a/debian/control b/debian/control
index f1ec843..6f1f1eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,12 @@
Maintainer: Jan Kaufman <jan.kaufman@tcpcloud.eu>
Section: admin
Priority: optional
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9),
+ openstack-pkg-tools,
+Build-Depends-Indep: python-all,
+ python-yaml,
+ python-virtualenv,
+ salt-master,
Standards-Version: 3.9.6
Homepage: http://www.tcpcloud.eu
Vcs-Browser: https://github.com/tcpcloud/salt-formula-tftpd-hpa
diff --git a/tests/pillar/server_single.sls b/tests/pillar/server_single.sls
index e6d8346..7c73b29 100644
--- a/tests/pillar/server_single.sls
+++ b/tests/pillar/server_single.sls
@@ -1,4 +1,10 @@
tftpd_hpa:
server:
enabled: true
-
+ bind:
+ address: '0.0.0.0'
+ port: 69
+ username: 'root'
+ options:
+ - secure
+ - map-file: '/var/lib/tftproot/map-file'
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 1f1316f..29fb975 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -6,11 +6,13 @@
CURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
METADATA=${CURDIR}/../metadata.yml
FORMULA_NAME=$(cat $METADATA | python -c "import sys,yaml; print yaml.load(sys.stdin)['name']")
+FORMULA_META_DIR=${CURDIR}/../${FORMULA_NAME}/meta
## Overrideable parameters
PILLARDIR=${PILLARDIR:-${CURDIR}/pillar}
BUILDDIR=${BUILDDIR:-${CURDIR}/build}
VENV_DIR=${VENV_DIR:-${BUILDDIR}/virtualenv}
+MOCK_BIN_DIR=${MOCK_BIN_DIR:-${CURDIR}/mock_bin}
DEPSDIR=${BUILDDIR}/deps
SALT_FILE_DIR=${SALT_FILE_DIR:-${BUILDDIR}/file_root}
@@ -18,7 +20,7 @@
SALT_CONFIG_DIR=${SALT_CONFIG_DIR:-${BUILDDIR}/salt}
SALT_CACHE_DIR=${SALT_CACHE_DIR:-${SALT_CONFIG_DIR}/cache}
-SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR}"
+SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR} --log-file=/dev/null"
if [ "x${SALT_VERSION}" != "x" ]; then
PIP_SALT_VERSION="==${SALT_VERSION}"
@@ -40,10 +42,20 @@
pip install salt${PIP_SALT_VERSION}
}
+setup_mock_bin() {
+ # If some state requires a binary, a lightweight replacement for
+ # such binary can be put into MOCK_BIN_DIR for test purposes
+ if [ -d "${MOCK_BIN_DIR}" ]; then
+ PATH="${MOCK_BIN_DIR}:$PATH"
+ export PATH
+ fi
+}
+
setup_pillar() {
[ ! -d ${SALT_PILLAR_DIR} ] && mkdir -p ${SALT_PILLAR_DIR}
echo "base:" > ${SALT_PILLAR_DIR}/top.sls
for pillar in ${PILLARDIR}/*; do
+ grep ${FORMULA_NAME}: ${pillar} &>/dev/null || continue
state_name=$(basename ${pillar%.sls})
echo -e " ${state_name}:\n - ${state_name}" >> ${SALT_PILLAR_DIR}/top.sls
done
@@ -56,6 +68,7 @@
echo "base:" > ${SALT_FILE_DIR}/top.sls
for pillar in ${PILLARDIR}/*.sls; do
+ grep ${FORMULA_NAME}: ${pillar} &>/dev/null || continue
state_name=$(basename ${pillar%.sls})
echo -e " ${state_name}:\n - ${FORMULA_NAME}" >> ${SALT_FILE_DIR}/top.sls
done
@@ -64,11 +77,13 @@
file_client: local
cachedir: ${SALT_CACHE_DIR}
verify_env: False
+minion_id_caching: False
file_roots:
base:
- ${SALT_FILE_DIR}
- ${CURDIR}/..
+ - /usr/share/salt-formulas/env
pillar_roots:
base:
@@ -78,16 +93,17 @@
}
fetch_dependency() {
- dep_root="${DEPSDIR}/$(basename $1 .git)"
+ dep_name="$(echo $1|cut -d : -f 1)"
+ dep_source="$(echo $1|cut -d : -f 2-)"
+ dep_root="${DEPSDIR}/$(basename $dep_source .git)"
dep_metadata="${dep_root}/metadata.yml"
- [ -d $dep_root ] && log_info "Dependency $1 already fetched" && return 0
+ [ -d /usr/share/salt-formulas/env/${dep_name} ] && log_info "Dependency $dep_name already present in system-wide salt env" && return 0
+ [ -d $dep_root ] && log_info "Dependency $dep_name already fetched" && return 0
- log_info "Fetching dependency $1"
+ log_info "Fetching dependency $dep_name"
[ ! -d ${DEPSDIR} ] && mkdir -p ${DEPSDIR}
- git clone $1 ${DEPSDIR}/$(basename $1 .git)
-
- dep_name=$(cat $dep_metadata | python -c "import sys,yaml; print yaml.load(sys.stdin)['name']")
+ git clone $dep_source ${DEPSDIR}/$(basename $dep_source .git)
ln -s ${dep_root}/${dep_name} ${SALT_FILE_DIR}/${dep_name}
METADATA="${dep_metadata}" install_dependencies
@@ -98,7 +114,7 @@
(python - | while read dep; do fetch_dependency "$dep"; done) << EOF
import sys,yaml
for dep in yaml.load(open('${METADATA}', 'ro'))['dependencies']:
- print dep["source"]
+ print '%s:%s' % (dep["name"], dep["source"])
EOF
}
@@ -108,14 +124,15 @@
}
salt_run() {
- source ${VENV_DIR}/bin/activate
+ [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}
prepare() {
[ -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR}
- setup_virtualenv
+ which salt-call || setup_virtualenv
+ setup_mock_bin
setup_pillar
setup_salt
install_dependencies
@@ -123,8 +140,28 @@
run() {
for pillar in ${PILLARDIR}/*.sls; do
+ grep ${FORMULA_NAME}: ${pillar} &>/dev/null || continue
state_name=$(basename ${pillar%.sls})
+ salt_run grains.set 'noservices' False force=True
+
+ echo "Checking state ${FORMULA_NAME}.${state_name} ..."
salt_run --id=${state_name} state.show_sls ${FORMULA_NAME} || (log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1)
+
+ # Check that all files in 'meta' folder can be rendered using any valid pillar
+ for meta in `find ${FORMULA_META_DIR} -type f`; do
+ meta_name=$(basename ${meta})
+ echo "Checking meta ${meta_name} ..."
+ salt_run --out=quiet --id=${state_name} cp.get_template ${meta} ${SALT_CACHE_DIR}/${meta_name} \
+ || (log_err "Failed to render meta ${meta} using pillar ${FORMULA_NAME}.${state_name}"; exit 1)
+ cat ${SALT_CACHE_DIR}/${meta_name}
+ done
+ done
+}
+
+real_run() {
+ for pillar in ${PILLARDIR}/*.sls; do
+ state_name=$(basename ${pillar%.sls})
+ salt_run --id=${state_name} state.sls ${FORMULA_NAME} || (log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1)
done
}
@@ -153,6 +190,9 @@
run)
run
;;
+ real-run)
+ real_run
+ ;;
*)
prepare
run
diff --git a/tftpd_hpa/files/tftpd-hpa.conf b/tftpd_hpa/files/tftpd-hpa.conf
new file mode 100644
index 0000000..089f15e
--- /dev/null
+++ b/tftpd_hpa/files/tftpd-hpa.conf
@@ -0,0 +1,15 @@
+{%- from "tftpd_hpa/map.jinja" import server with context %}
+{%- set opts = [] %}
+{%- for data in server.get('options', []) %}
+{%- if data is mapping %}
+{%- for opt, val in data.iteritems() %}
+{%- do opts.append('--' + opt + ' ' + val) %}
+{%- endfor %}
+{%- else %}
+{%- do opts.append("--" + data) %}
+{%- endif %}
+{%- endfor -%}
+TFTP_USERNAME="{{ server.username }}"
+TFTP_DIRECTORY="{{ server.path }}"
+TFTP_ADDRESS="{{ server.bind.address }}:{{ server.bind.port }}"
+TFTP_OPTIONS="{{ ' '.join(opts) }}"
diff --git a/tftpd_hpa/map.jinja b/tftpd_hpa/map.jinja
index 64fee22..15596b1 100644
--- a/tftpd_hpa/map.jinja
+++ b/tftpd_hpa/map.jinja
@@ -1,21 +1,25 @@
+{% set server = salt['grains.filter_by']({
+ 'Common': {
+ 'service': 'tftpd-hpa',
+ 'path': '/var/lib/tftpboot',
+ 'username': 'tftp',
+ 'bind': {
+ 'address': '',
+ 'port': 69
+ },
+ 'options': ['--secure']
+ },
+ 'Debian': {
+ 'pkgs': ['tftpd-hpa', 'syslinux'],
+ 'config_file': '/etc/default/tftpd-hpa'
+ },
+ 'RedHat': {
+ 'pkgs': ['tftp-server', 'syslinux']
+ }
+}, base='Common', merge=salt['grains.filter_by']({
+ 'Ubuntu': {
+ 'path': '/srv/tftp'
+ },
+}, grain='os')) %}
-{%- load_yaml as raw_server %}
-Debian:
- pkgs:
- - tftpd-hpa
- - syslinux
- {%- if salt['grains.get']('os') == 'Ubuntu' %}
- path: /var/lib/tftpboot
- {%- else %}
- path: /srv/tftp
- {%- endif %}
- service: tftpd-hpa
-RedHat:
- pkgs:
- - tftp-server
- - syslinux
- root: /var/lib/tftpboot/
- service: tftpd-hpa
-{%- endload %}
-
-{%- set server = salt['grains.filter_by'](raw_server, merge=salt['pillar.get']('tftpd_hpa:server')) %}
+{% do server.update(pillar.tftpd_hpa.get('server', {})) %}
diff --git a/tftpd_hpa/server.sls b/tftpd_hpa/server.sls
index eb716d3..a022d18 100644
--- a/tftpd_hpa/server.sls
+++ b/tftpd_hpa/server.sls
@@ -5,10 +5,24 @@
pkg.installed:
- pkgs: {{ server.pkgs }}
+{{ server.config_file }}:
+ file.managed:
+ - name: {{ server.config_file }}
+ source: salt://tftpd_hpa/files/tftpd-hpa.conf
+ template: jinja
+
tftpd_hpa_service:
service.running:
- name: {{ server.service }}
- enable: true
- running: true
+ - watch:
+ - file: {{ server.config_file }}
-{%- endif %}
\ No newline at end of file
+{{ server.path }}:
+ file.directory:
+ - makedirs: True
+ - name: {{ server.path }}
+ - user: {{ server.username }}
+
+{%- endif %}