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

Merge remote-tracking branch 'telmich/master'

Browse source
This commit is contained in:
Steven Armstrong 2014-09-29 11:23:28 +02:00
commit 27b9e1ba6c
6 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cdist/conf/explorer/cpu_cores
View file

@ -22,10 +22,19 @@
# FIXME: other system types (not linux ...) # FIXME: other system types (not linux ...)
if [ -r /proc/cpuinfo ]; then os=$("$__explorer/os")
cores="$(cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l)" case "$os" in
if [ ${cores} -eq 0 ]; then "macosx")
cores="1" echo "$(sysctl -n hw.physicalcpu)"
fi ;;
echo "${cores}"
fi *)
if [ -r /proc/cpuinfo ]; then
cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
if [ ${cores} -eq 0 ]; then
cores="1"
fi
echo "$cores"
fi
;;
esac

21
cdist/conf/explorer/cpu_sockets
View file

@ -22,10 +22,19 @@
# FIXME: other system types (not linux ...) # FIXME: other system types (not linux ...)
if [ -r /proc/cpuinfo ]; then os=$("$__explorer/os")
sockets="$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)" case "$os" in
if [ ${sockets} -eq 0 ]; then "macosx")
sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)" echo "$(system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}')"
;;
*)
if [ -r /proc/cpuinfo ]; then
sockets="$(grep "physical id" /proc/cpuinfo | sort | uniq | wc -l)"
if [ ${sockets} -eq 0 ]; then
sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
fi
echo "${sockets}"
fi fi
echo "${sockets}" ;;
fi esac

15
cdist/conf/explorer/memory
View file

@ -22,6 +22,15 @@
# FIXME: other system types (not linux ...) # FIXME: other system types (not linux ...)
if [ -r /proc/meminfo ]; then os=$("$__explorer/os")
echo "$(cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')" case "$os" in
fi "macosx")
echo "$(sysctl -n hw.memsize)/1024" | bc
;;
*)
if [ -r /proc/meminfo ]; then
grep "MemTotal:" /proc/meminfo | awk '{print $2}'
fi
;;
esac

2
cdist/core/manifest.py
View file

@ -144,4 +144,4 @@ class Manifest(object):
type_manifest = os.path.join(self.local.type_path, cdist_object.cdist_type.manifest_path) type_manifest = os.path.join(self.local.type_path, cdist_object.cdist_type.manifest_path)
message_prefix = cdist_object.name message_prefix = cdist_object.name
if os.path.isfile(type_manifest): if os.path.isfile(type_manifest):
self.local.run_script(type_manifest, env=self.env_type_manifest(cdist_object)) self.local.run_script(type_manifest, env=self.env_type_manifest(cdist_object), message_prefix=message_prefix)

1
docs/changelog
View file

@ -7,6 +7,7 @@ Changelog
3.1.7: 3.1.7:
* Type __cdistmarker: Fix typo (Ricardo Catalinas Jiménez) * Type __cdistmarker: Fix typo (Ricardo Catalinas Jiménez)
* Core: Bugfix: Export messaging to manifests (Ricardo Catalinas Jiménez)
3.1.6: 2014-08-18 3.1.6: 2014-08-18
* New Type: __ssh_dot_ssh * New Type: __ssh_dot_ssh

4
docs/man/cdist-reference.text.sh
View file

@ -203,10 +203,10 @@ __global::
Directory that contains generic output like explorer. Directory that contains generic output like explorer.
Available for: initial manifest, type manifest, type gencode, shell Available for: initial manifest, type manifest, type gencode, shell
__messages_in:: __messages_in::
File to read messages from File to read messages from.
Available for: initial manifest, type manifest, type gencode Available for: initial manifest, type manifest, type gencode
__messages_out:: __messages_out::
File to write messages File to write messages.
Available for: initial manifest, type manifest, type gencode Available for: initial manifest, type manifest, type gencode
__object:: __object::
Directory that contains the current object. Directory that contains the current object.