diff options
| author | startxfr <clarue@startx.fr> | 2017-07-23 14:23:43 +0200 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2017-07-23 14:23:43 +0200 |
| commit | 11621aff584557c0141cef87b6e229f382349e9e (patch) | |
| tree | e3256f0c3e19b5a020efbc8671090799906515e6 /Bombs | |
| parent | aec34cca4a69039bf300ad60e2b356936bad466a (diff) | |
change user setting in openshift centos image to be compliant with openshift container policy
Diffstat (limited to 'Bombs')
| -rw-r--r-- | Bombs/cpu/sx.sh | 34 | ||||
| -rw-r--r-- | Bombs/mem/sx.sh | 34 |
2 files changed, 4 insertions, 64 deletions
diff --git a/Bombs/cpu/sx.sh b/Bombs/cpu/sx.sh index 2f2607a..e028787 100644 --- a/Bombs/cpu/sx.sh +++ b/Bombs/cpu/sx.sh @@ -2,40 +2,12 @@ export TERM=xterm pid=0 -function check_environment { - if [ ! -v CONTAINER_TYPE ]; then - CONTAINER_TYPE="unknown" - export CONTAINER_TYPE - echo "! WARNING : environment var CONTAINER_TYPE is missing..." - echo "! WARNING : auto-assigned value : $CONTAINER_TYPE" - fi - if [ ! -v CONTAINER_SERVICE ]; then - CONTAINER_SERVICE=$CONTAINER_TYPE; - export CONTAINER_SERVICE; - echo "! WARNING : environment var CONTAINER_SERVICE is missing..." - echo "! WARNING : auto-assigned value : $CONTAINER_SERVICE" - fi - if [ ! -v CONTAINER_INSTANCE ]; then - CONTAINER_INSTANCE=$CONTAINER_TYPE "_" $CONTAINER_SERVICE; - export CONTAINER_INSTANCE; - echo "! WARNING : environment var CONTAINER_INSTANCE is missing..." - echo "! WARNING : auto-assigned value : $CONTAINER_INSTANCE" - fi -} - function display_container_header { echo "+=====================================================" echo "| Container : $HOSTNAME" echo "| OS : $(</etc/redhat-release)" - if [ -v CONTAINER_TYPE ]; then - echo "| Type : $CONTAINER_TYPE" - fi - if [ -v CONTAINER_SERVICE ]; then - echo "| Service : $CONTAINER_SERVICE" - fi - if [ -v CONTAINER_INSTANCE ]; then - echo "| Instance : $CONTAINER_INSTANCE" - fi + echo "| kubernetes : $KUBERNETES_SERVICE_HOST" + echo "| user : $(</etc/whoami)" echo "+=====================================================" } @@ -59,7 +31,5 @@ function start_service { exit 0 } - -check_environment display_container_header start_service
\ No newline at end of file diff --git a/Bombs/mem/sx.sh b/Bombs/mem/sx.sh index fd9115e..f607a0f 100644 --- a/Bombs/mem/sx.sh +++ b/Bombs/mem/sx.sh @@ -2,40 +2,12 @@ export TERM=xterm pid=0 -function check_environment { - if [ ! -v CONTAINER_TYPE ]; then - CONTAINER_TYPE="unknown" - export CONTAINER_TYPE - echo "! WARNING : environment var CONTAINER_TYPE is missing..." - echo "! WARNING : auto-assigned value : $CONTAINER_TYPE" - fi - if [ ! -v CONTAINER_SERVICE ]; then - CONTAINER_SERVICE=$CONTAINER_TYPE; - export CONTAINER_SERVICE; - echo "! WARNING : environment var CONTAINER_SERVICE is missing..." - echo "! WARNING : auto-assigned value : $CONTAINER_SERVICE" - fi - if [ ! -v CONTAINER_INSTANCE ]; then - CONTAINER_INSTANCE=$CONTAINER_TYPE "_" $CONTAINER_SERVICE; - export CONTAINER_INSTANCE; - echo "! WARNING : environment var CONTAINER_INSTANCE is missing..." - echo "! WARNING : auto-assigned value : $CONTAINER_INSTANCE" - fi -} - function display_container_header { echo "+=====================================================" echo "| Container : $HOSTNAME" echo "| OS : $(</etc/redhat-release)" - if [ -v CONTAINER_TYPE ]; then - echo "| Type : $CONTAINER_TYPE" - fi - if [ -v CONTAINER_SERVICE ]; then - echo "| Service : $CONTAINER_SERVICE" - fi - if [ -v CONTAINER_INSTANCE ]; then - echo "| Instance : $CONTAINER_INSTANCE" - fi + echo "| kubernetes : $KUBERNETES_SERVICE_HOST" + echo "| user : $(</etc/whoami)" echo "+=====================================================" } @@ -59,7 +31,5 @@ function start_service { exit 0 } - -check_environment display_container_header start_service
\ No newline at end of file |