search for: ovirt_store_config

This fix enables the persistance of empty configuration files during firstboot, in ovirt_store_config, so configuration files like ssh/ssl keys that are dynamically generated to well known locations can be pre set for persistance. Signed-off-by: Ricardo Marin Matinata <matinata at br.ibm.com> --- scripts/ovirt-functions | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git...

This fix enables the persistance of empty configuration files during firstboot, in ovirt_store_config, so configuration files like ssh/ssl keys that are dynamically generated (i.e. content is not known until the node has booted at least one time) to well known locations can be pre set for persistance. Signed-off-by: Ricardo Marin Matinata <matinata at br.ibm.com> --- scripts/ovirt-functions...

...ONFIG_OUTPUT_FILE if [ -f $OVIRT_CONFIG_OUTPUT_FILE ]; then augtool $OVIRT_CONFIG_OUTPUT_FILE \ - && RESULT=0 || RESULT=1 + && RESULT=0 || RESULT=1 # FIXME do not store ifcfg-lo if ls /etc/sysconfig/network-scripts/ifcfg* >/dev/null 2>/dev/null; then - ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* + ovirt_store_config /etc/sysconfig/network-scripts/ifcfg* fi fi -- 1.6.6.1

parse input augtool strings to oper,key,value --- scripts/network.py | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index f51ee7c..65b551c 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -165,11 +165,11 @@ class Network: ntpconf = ntpconf.split("\n") for line

....system("service ntpdate start &> /dev/null") + os.system("service ntpd start &> /dev/null") def save_network_configuration(self): net_configured=0 @@ -255,10 +258,13 @@ class Network: for nic in self.CONFIGURED_NICS: ovirt_store_config("%s%s" % (self.IFSCRIPTS_PATH, nic) ) ovirt_store_config(self.NTP_CONFIG_FILE) + augtool("set", "/files/etc/sysconfig/network/NETWORKING", "yes") + ovirt_store_config("/etc/sysconfig/network") log("Network config...

.../ovirt-functions | 80 +++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 41 deletions(-) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index cfcedbb..c2ef94b 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -464,13 +464,14 @@ ovirt_store_config() { rc=0 if grep -q " /config ext3" /proc/mounts; then for p in "$@"; do + local filename=$(readlink -f $p) local persist_it=true # ensure that, if this is a directory # that it's not already persisted -...

...string.digits + './') + return crypt.crypt (password, saltstr) + +def set_root_password(password): + user = self.__admin.initUser(root) + passwd = cryptPassword() + unmount_config("/etc/shadow") + user.set(passwd, password) + ovirt_store_config("/etc/shadow") + +def check_ssh_password_auth(self): + password_auth_status = augeas.Augeas("root=/") + password_auth_status.get("/files/etc/ssh/sshd_config/PasswordAuthentication") + return password_auth_status + +def toggle_ssh_access(status): + ssh_confi...

...ostname.value() != self.current_hostname and is_valid_hostname(self.net_hostname.value()): augtool("set", "/files/etc/sysconfig/network/HOSTNAME", self.net_hostname.value()) os.system("hostname " + self.net_hostname.value()) - ovirt_store_config("/etc/sysconfig/network") + ovirt_store_config("/etc/sysconfig/network") dns_servers = "" ntp_servers = "" if not self.dns_host1.value() == "": diff --git a/scripts/ovirtfunctions.py b/scripts/ovirtfunctions...

...f [ -d /dev/HostVG ]; then log "Uninstalling node" log "Detaching logging" diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index e938256..09ddf50 100755 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -627,6 +627,24 @@ chkconfig_persist() { ovirt_store_config $to_persist } +# Asks a yes or no question. Accepts Y/N/A so users can abort. +# RC=0 - Y/y entered +# RC=1 - N/n entered +# RC=2 - A/a entered +ask_yes_or_no () { + local prompt=${1-"Do you wish to proceed (y/n)?"} + + read -ep "${prompt} " + if [[ "${REPLY}&qu...

...name_1}" + elif [ -e ${devname_2 ]; then + eval "${dev_var}"="${devname_2}" + else + return 1 + fi + eval "${part_var}"="${part_number}" + return $rc +} + # execute a function if called as a script, e.g. # ovirt-functions ovirt_store_config /etc/hosts -- 1.6.6.1

...-boot index dd53988..b2efe71 100755 --- a/scripts/ovirt-config-boot +++ b/scripts/ovirt-config-boot @@ -170,10 +170,6 @@ EOF return $rc fi - # install iscsi initiator name for this machine - echo "InitiatorName=$(iscsi-iname)" > /etc/iscsi/initiatorname.iscsi - ovirt_store_config /etc/iscsi/initiatorname.iscsi - umount /liveos umount /boot # mark new Root ready to go, reboot() in ovirt-function switches it to active diff --git a/scripts/ovirt-config-iscsi b/scripts/ovirt-config-iscsi new file mode 100755 index 0000000..8e1bbaf --- /dev/null +++ b/scripts/ovir...

...RIVE}p1" fi @@ -817,11 +817,26 @@ do_confirm() else return fi + # store networking config since it was created before storage was established for iscsi targets + if [ "$OVIRT_ISCSI_NETWORKING" == "y" ]; then + ovirt_store_config \ + /etc/sysconfig/network-scripts/ifcfg* \ + /etc/ntp.conf + fi done } do_iscsi_target() { +if ! network_up ; then + printf "Networking must be configured prior to configuring an iscsi target.\n\n" + # allow network config without setting up storage f...

...+ +def restore_console_colors(): + GIO_CMAP = 0x4B70 + PIO_CMAP = 0x4B71 + tty_file = open("/dev/console", "rw") + fcntl.ioctl(tty_file.fileno(), PIO_CMAP, bytes(.existing_color_array)) + +def ovirt_store_firstboot_config(): + # persist config for standalone + ovirt_store_config(OVIRT_CONFIG_FILES) + +# return 1 if oVirt Node is running in standalone mode +# return 0 if oVirt Node is managed by the oVirt Server +def is_managed(): + return OVIRT_VARS["OVIRT_STANDALONE"] + +# oVirt Node in standalone mode does not try to contact the oVirt Server +def is_standalo...

...39;%t' $dm) -a \ + $minor = $(stat -c '%T' $dm) ]; then + local dm_device=$dm + rc=0 + break + fi + done + + eval $return_var=$dm_device + + return $rc +} + # execute a function if called as a script, e.g. # ovirt-functions ovirt_store_config /etc/hosts -- 1.6.6.1

...+ b/scripts/ovirt-config-logging @@ -174,6 +174,13 @@ function prompt_user { done } +function ovirt_netconsole { + augtool <<EOF +set /files/etc/sysconfig/netconsole/SYSLOGADDR $OVIRT_NETCONSOLE_SERVER +set /files/etc/sysconfig/netconsole/SYSLOGPORT $OVIRT_NETCONSOLE_PORT +EOF + ovirt_store_config /etc/sysconfig/netconsole +} # AUTO for auto-install if [ "$1" = "AUTO" ]; then if [ -z "$OVIRT_SYSLOG_SERVER" -o -z "$OVIRT_SYSLOG_PORT" ]; then @@ -189,6 +196,10 @@ if [ "$1" = "AUTO" ]; then printf "\nUsing default...

I'm looking for feedback on this first patch. The node has been pushed towards a more generic boot process. With this patch the node can now boot up and execute a few specifically-named scripts that reside in /etc/node.d/ at key points during the startup. After this goes upstream, the next step will be to define in more detail the remote interfaces for the "managed" runtime

This patch includes feedback from apevec to remain backward compatible with the previous karg, ovirt_local_boot.

...-git a/scripts/ovirt-functions b/scripts/ovirt-functions index 6435387..7ed6491 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -1,4 +1,4 @@ -# -*-Shell-script-*- +\# -*-Shell-script-*- OVIRT_LOGFILE=/var/log/ovirt.log OVIRT_TMP_LOGFILE=/tmp/ovirt.log @@ -458,28 +458,41 @@ ovirt_store_config() { if grep -q " /config ext3" /proc/mounts; then printf "storing to /config :\n" for p in "$@"; do - f=$(readlink -f $p) - printf "$f" - # skip if file does not exist or is empty - if [ ! -s...

...gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot" # mount /config unless firstboot is forced if [ "$firstboot" != "1" ]; then mount_config @@ -426,7 +426,7 @@ start() { ovirt_store_config \ /etc/sysconfig/network-scripts/ifcfg-* \ $BONDING_MODCONF_FILE - if [ $local_boot = 1 ]; then + if [ $upgrade = 1 ]; then # local disk installation for managed mode mount_live ovirt-config-b...

...ready up +network_up () { + UPIFS=$(/sbin/ip -o link show up | awk -F ": " '{ print $2 }' | grep -v lo | wc -l) + test -n "${UPIFS}" -a "${UPIFS}" -gt "0" + return $? +} + # execute a function if called as a script, e.g. # ovirt-functions ovirt_store_config /etc/hosts -- 1.6.6