diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-12-26 05:43:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-26 05:43:09 +0000 |
| commit | 3e7c69cce5778fbe371b88ec50086997ca6290ff (patch) | |
| tree | be2a3f72ae780b3da96fa4be0dd689fc07cf0933 | |
| parent | 26df202d264c46e13ccbf0ab9502e7b48c73d1cf (diff) | |
| parent | 340b49d75690ccdb3f36378c3e20e8e5c13a212a (diff) | |
Merge "Generate .ssh/known_hosts when making VM image"
| -rwxr-xr-x | ci/deploy/deploy.sh | 5 | ||||
| -rwxr-xr-x | tools/centos-img-modify.sh | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 283dad1e..4ea87b6b 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -437,11 +437,6 @@ function install_daisy() else echo "daisy install successfully" fi - - #TODO: Why need this? - echo "====== generate known_hosts file in daisy vm ======" - touch $WORKSPACE/known_hosts - scp $WORKSPACE/known_hosts root@$DAISY_IP:/root/.ssh/ } function config_daisy() diff --git a/tools/centos-img-modify.sh b/tools/centos-img-modify.sh index fe35126b..5a2df82f 100755 --- a/tools/centos-img-modify.sh +++ b/tools/centos-img-modify.sh @@ -58,6 +58,12 @@ host_name=daisy echo ${host_name} > /etc/hostname sed -i "/^127.0.0.1/s/ localhost / ${host_name} localhost /g" /etc/hosts +# required by daisycloud-core daisy/api/backends/osinstall/pxe/install.py +# This can be removed when upstream fix it. +mkdir -p -m 700 /root/.ssh +touch /root/.ssh/known_hosts +chmod 600 /root/.ssh/known_hosts + # Allow console access via pwd cat << EOF > /etc/cloud/cloud.cfg.d/default.cfg disable_root: False |