From 3a7d35f220f2880a280df210348a8a919e7c0ed8 Mon Sep 17 00:00:00 2001 From: jjhua Date: Wed, 10 Apr 2013 09:23:56 +0000 Subject: [PATCH] 1. modifies some comments 2. add the rpm post script git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15924 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../chef/chef-x86_64/scripts/client.post | 2 +- .../chef/chef-x86_64/scripts/client.rpm_post | 22 +++++++++++++++++++ .../chef/chef-x86_64/scripts/server.post | 2 +- .../chef/chef-x86_64/scripts/server.rpm_post | 17 ++++++++++++++ .../chef/chef-x86_64/scripts/workstation.post | 2 +- .../chef-x86_64/scripts/workstation.rpm_post | 22 +++++++++++++++++++ 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100755 xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post create mode 100755 xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post create mode 100755 xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post index ccb067d53..f76525258 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post @@ -5,7 +5,7 @@ #------------------------------------------------------------------------------- #=head1 client.post #=head2 This command configures the chef client on a xCAT node. It is used -# as a post installation script for chef_client_kit.rpm. +# as a postbootscript for chef_client kit #=cut #------------------------------------------------------------------------------- if [ "$NODESETSTATE" = "install" ]; then diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post new file mode 100755 index 000000000..709c34b10 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post @@ -0,0 +1,22 @@ +#!/bin/sh +# IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html + + +#------------------------------------------------------------------------------- +#=head1 client.post +#=head2 This command configures the chef client on a xCAT node. It is used +# as a post installation script for chef_client_kit.rpm +#=cut +#------------------------------------------------------------------------------- +if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image + #configure the chef client configuration files + /xcatpost/config_chef_client "$@" +fi + +exit 0 + + + + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post index 7804dee92..8b5d534d4 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post @@ -5,7 +5,7 @@ #------------------------------------------------------------------------------- #=head1 server.post #=head2 This command configures the chef server on a xCAT server or node. -# It is used as a post install script for chef_server_kit.rpm +# It is used as a postbootscript for chef_server kit #=cut #------------------------------------------------------------------------------- if [ "$NODESETSTATE" = "install" ]; then diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post new file mode 100755 index 000000000..8c6ac5de7 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post @@ -0,0 +1,17 @@ +#!/bin/sh +# IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html + + +#------------------------------------------------------------------------------- +#=head1 server.post +#=head2 This command configures the chef server on a xCAT server or node. +# It is used as a post install script for chef_server_kit.rpm +#=cut +#------------------------------------------------------------------------------- +if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image + #Now configure the chef server + /xcatpost/config_chef_server +fi + +exit 0 + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post index 00b801978..44e5a87a8 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post @@ -5,7 +5,7 @@ #------------------------------------------------------------------------------- #=head1 workstation.post #=head2 This command configures the chef workstation on a xCAT node. It is used -# as a post installation script for chef_workstation_kit.rpm. +# as a postbootscript for chef_workstation kit #=cut #------------------------------------------------------------------------------- if [ "$NODESETSTATE" = "install" ]; then diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post new file mode 100755 index 000000000..5446e8fa1 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post @@ -0,0 +1,22 @@ +#!/bin/sh +# IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html + + +#------------------------------------------------------------------------------- +#=head1 workstation.post +#=head2 This command configures the chef workstation on a xCAT node. It is used +# as a post installation script for chef_workstation_kit.rpm +#=cut +#------------------------------------------------------------------------------- +if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image + #configure the chef workstation configuration files + /xcatpost/config_chef_workstation "$@" +fi + +exit 0 + + + + + +