Skip to content

Commit

Permalink
Small installer improvements - closes #56
Browse files Browse the repository at this point in the history
  • Loading branch information
dn0 committed Jul 3, 2017
1 parent 4cd5152 commit 2791426
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
15 changes: 9 additions & 6 deletions ansible/templates/usb/scripts/computenode.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,15 @@ function random_string() {
openssl rand -base64 "${length}" | tr -dc _A-Z-a-z-0-9
}

function reload_smf_manifests() {
printf_log "\r%-64s" "Reloading SMF manifests... "
function import_smf_manifests() {
printf_log "%-64s" "Importing SMF manifests... "

for manifest in /opt/custom/smf/*; do
svccfg validate "${manifest}" || fatal "Failed to validate SMF manifest at ${manifest}"
svccfg import "${manifest}"
done

printf_log "%4s\n" "done"
# This will make the output to look nicer/aligned
svcadm disable -s svc:/system/manifest-import:default
svcadm enable -s svc:/system/manifest-import:default
}

#
Expand All @@ -253,7 +256,7 @@ configure_erigonesd
configure_zabbix

install_isos
reload_smf_manifests
import_smf_manifests
create_setup_file
inform_user

5 changes: 4 additions & 1 deletion ansible/templates/usb/scripts/prompt-config.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,10 @@ setting a hostname.\n\n"
message="
The IP address set here will host the web administration portal of your
Danube Cloud installation. This IP address will also be used as a basis
for enumerating other Danube Cloud administrative zones' networking.\n\n"
for enumerating other Danube Cloud administrative zones' networking.
Five IP addresses following the management portal IP address will be used
for Danube Cloud service zones. Please make sure that the IP addresses are
available for automatic allocation.\n\n"
{% else %}
message="
Every compute node in Danube Cloud has to be connected to the management VM.
Expand Down

0 comments on commit 2791426

Please sign in to comment.