Updated Branches: refs/heads/master 1eec6fa26 -> 2c9e9eef0
Changed location where we set the root password in a devcloud build Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2c9e9eef Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2c9e9eef Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2c9e9eef Branch: refs/heads/master Commit: 2c9e9eef0aa21e081d38127519660cc7583c08b4 Parents: 1eec6fa Author: Chip Childers <[email protected]> Authored: Mon Aug 13 09:13:01 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Mon Aug 13 09:13:01 2012 -0400 ---------------------------------------------------------------------- .../puppet-devcloudinitial/manifests/init.pp | 12 ------------ tools/devcloud/veewee/postinstall.sh | 1 + 2 files changed, 1 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2c9e9eef/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp ---------------------------------------------------------------------- diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp b/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp index a3c5c3d..ded2067 100644 --- a/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp +++ b/tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp @@ -103,16 +103,4 @@ class puppet-devcloudinitial { owner => '0', } - user { 'root': - ensure => 'present', - comment => 'root', - gid => '0', - home => '/root', - password => '$6$SCixzUjT$sVs9PwR2g7XdHSLnQW5Zsy2dVpVV3qESFV4Joniusbu3BqWUtKgc91vwEDwPhLqyCYM3kKR1.7G9g2Hu/pTQN/', - password_max_age => '99999', - password_min_age => '0', - shell => '/bin/bash', - uid => '0', - } - } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2c9e9eef/tools/devcloud/veewee/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/devcloud/veewee/postinstall.sh b/tools/devcloud/veewee/postinstall.sh index a650501..aeafafe 100644 --- a/tools/devcloud/veewee/postinstall.sh +++ b/tools/devcloud/veewee/postinstall.sh @@ -26,6 +26,7 @@ apt-get clean # Setup sudo to allow no-password sudo for "admin" groupadd -r admin usermod -a -G admin devcloud +echo "root:password" | chpasswd sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
