kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added --state absent functionality to docker types

Browse source 
Changed types:
__docker
__docker_compose
This commit is contained in:
Dominique Roux 2016-12-29 14:36:46 +01:00
parent b444697f33
commit 95b92627aa
7 changed files with 51 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cdist/conf/type/__docker/manifest
View file

@ -20,6 +20,7 @@
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
state=$(cat "$__object/parameter/state")
case "$os" in case "$os" in
centos) centos)
@ -27,31 +28,31 @@ case "$os" in
if [ -f "$__object/parameter/experimental" ]; then if [ -f "$__object/parameter/experimental" ]; then
component="experimental" component="experimental"
fi fi
export CDIST_ORDER_DEPENDENCY=on
__yum_repo docker \ __yum_repo docker \
--name 'Docker Repository' \ --name 'Docker Repository' \
--baseurl "https://yum.dockerproject.org/repo/$component/centos/\$releasever/" \ --baseurl "https://yum.dockerproject.org/repo/$component/centos/\$releasever/" \
--enabled \ --enabled \
--gpgcheck \ --gpgcheck 1 \
--gpgkey 'https://yum.dockerproject.org/gpg' --gpgkey 'https://yum.dockerproject.org/gpg' \
__package docker-engine --state ${state}
unset CDIST_ORDER_DEPENDENCY require="__yum_repo/docker" __package docker-engine --state ${state}
;; ;;
ubuntu) ubuntu)
component="main" component="main"
if [ -f "$__object/parameter/experimental" ]; then if [ -f "$__object/parameter/experimental" ]; then
component="experimental" component="experimental"
fi fi
__package apparmor __package apparmor --state ${state}
__package ca-certificates __package ca-certificates --state ${state}
__package apt-transport-https __package apt-transport-https --state ${state}
__apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D --state ${state}
export CDIST_ORDER_DEPENDENCY=on export CDIST_ORDER_DEPENDENCY=on
__apt_source docker \ __apt_source docker \
--uri https://apt.dockerproject.org/repo \ --uri https://apt.dockerproject.org/repo \
--distribution "ubuntu-$(cat "$__global/explorer/lsb_codename")" \ --distribution "ubuntu-$(cat "$__global/explorer/lsb_codename")" \
--state ${state} \
--component "$component" --component "$component"
__package docker-engine __package docker-engine --state ${state}
unset CDIST_ORDER_DEPENDENCY unset CDIST_ORDER_DEPENDENCY
;; ;;
debian) debian)
@ -60,16 +61,17 @@ case "$os" in
component="experimental" component="experimental"
fi fi
__package apt-transport-https __package apt-transport-https --state ${state}
__package ca-certificates __package ca-certificates --state ${state}
__package gnupg2 __package gnupg2 --state ${state}
__apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D --state ${state}
export CDIST_ORDER_DEPENDENCY=on export CDIST_ORDER_DEPENDENCY=on
__apt_source docker \ __apt_source docker \
--uri https://apt.dockerproject.org/repo \ --uri https://apt.dockerproject.org/repo \
--distribution "debian-$(cat "$__global/explorer/lsb_codename")" \ --distribution "debian-$(cat "$__global/explorer/lsb_codename")" \
--state ${state} \
--component "$component" --component "$component"
__package docker-engine __package docker-engine --state ${state}
unset CDIST_ORDER_DEPENDENCY unset CDIST_ORDER_DEPENDENCY
;; ;;

1
cdist/conf/type/__docker/parameter/default/state Normal file
View file

@ -0,0 +1 @@
present

1
cdist/conf/type/__docker/parameter/optional Normal file
View file

@ -0,0 +1 @@
state

3
cdist/conf/type/__docker_compose/gencode-remote
View file

@ -20,9 +20,12 @@
# Variables # Variables
version="$(cat "$__object/parameter/version")" version="$(cat "$__object/parameter/version")"
state="$(cat "$__object/parameter/state")"
if [ ${state} = "present" ]; then
# Download docker-compose file # Download docker-compose file
echo 'curl -L "https://github.com/docker/compose/releases/download/'${version}'/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose' echo 'curl -L "https://github.com/docker/compose/releases/download/'${version}'/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose'
echo 'mv /tmp/docker-compose /usr/local/bin/docker-compose' echo 'mv /tmp/docker-compose /usr/local/bin/docker-compose'
# Change permissions # Change permissions
echo 'chmod +x /usr/local/bin/docker-compose' echo 'chmod +x /usr/local/bin/docker-compose'
fi

11
cdist/conf/type/__docker_compose/manifest
View file

@ -19,6 +19,15 @@
# #
# #
state="$(cat "$__object/parameter/state")"
# Needed packages # Needed packages
__docker __docker --state ${state}
__package curl __package curl
if [ ${state} = "absent" ]; then
__file /usr/local/bin/docker-compose --state absent
elif [ ${state} != "present" -a ${state} != "absent" ]; then
echo "Unknown state: $state_should" >&2
exit 1
fi

1
cdist/conf/type/__docker_compose/parameter/default/state Normal file
View file

@ -0,0 +1 @@
present

1
cdist/conf/type/__docker_compose/parameter/optional
View file

@ -1 +1,2 @@
state
version version