Ohad Basan has uploaded a new change for review. Change subject: ovirt-live: remove fedora ......................................................................
ovirt-live: remove fedora currently only centos is working well on ovirt 3.3 removing this directory until it's ironed up Change-Id: Ia2c2785e0c3245d2275d52cb2d165af63a74c89b Signed-off-by: Ohad Basan <[email protected]> --- D fedora/Makefile D fedora/kickstart/ovirt.ks D fedora/oVirtLiveFiles/desktop-backgrounds-spherical-cow.xml D fedora/oVirtLiveFiles/engine-setup-yad.sh D fedora/oVirtLiveFiles/images/ovirt-icon-128.png D fedora/oVirtLiveFiles/images/ovirt-setup.png D fedora/oVirtLiveFiles/images/ovirt-usb-stick.png D fedora/oVirtLiveFiles/images/ovirt-usb-stick.svg D fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg D fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg D fedora/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg D fedora/oVirtLiveFiles/ovirt-answer D fedora/oVirtLiveFiles/patches/0001-oVirtLive-patches.patch D fedora/oVirtLiveFiles/root/etc/gdm/custom.conf D fedora/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf D fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 D fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 D fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt D fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 D fedora/oVirtLiveFiles/root/etc/yum.repos.d/ovirt.repo D fedora/oVirtLiveFiles/root/usr/share/applications/engine-setup.desktop D fedora/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop D fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override D fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override D fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override D fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override D fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py D fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py D fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py 29 files changed, 0 insertions(+), 854 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/66/19566/1 diff --git a/fedora/Makefile b/fedora/Makefile deleted file mode 100644 index 54f58a0..0000000 --- a/fedora/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Makefile for oVirt Live -# -# Make sure you have spin-kickstarts.noarch and livecd-tools installed. - -NAME=ovirt-live -VERSION=1.0.0 -RELEASE=0.1 -SUFFIX="master.$(shell date --utc +%Y%m%d).git$(shell git rev-parse --short HEAD)" - -clean: - rm -rf oVirtLiveFiles/iso *.iso - -iso: - cp -f /usr/share/spin-kickstarts/fedora-live-base.ks kickstart/ovirt-live-base.ks - sed -i -e 's/selinux \-\-enforcing/selinux \-\-permissive/g' \ - -e 's/services \-\-enabled\=NetworkManager \-\-disabled\=network\,sshd/services \-\-enabled\=NetworkManager\,sshd \-\-disabled\=network\,firewalld\nrepo \-\-name\=ovirt \-\-baseurl\=http:\/\/ovirt.org\/releases\/stable\/rpm\/Fedora\/19/g' \ - -e 's/liveuser/oVirtuser/g' \ - -e 's/firewall \-\-enabled/firewall \-\-disabled/g' \ - -e 's/livedir\=\"LiveOS\"/livedir\=\"LiveoVirt\"/g' \ - -e "s/\(^.*stop.*atd\..*:\)/\1\nmodprobe dummy/g" kickstart/ovirt-live-base.ks - - wget -N http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/TinyCore-current.iso - wget -N http://download.fedoraproject.org/pub/fedora/linux/releases/19/Live/x86_64/Fedora-Live-Desktop-x86_64-19-1.iso - if [[ ! -d oVirtLiveFiles/iso ]]; then - mkdir oVirtLiveFiles/iso - fi - mv -f *.iso oVirtLiveFiles/iso - - livecd-creator -d -v \ - --config=kickstart/ovirt.ks \ - --cache=/home \ - --fslabel=$(NAME)-$(VERSION)-$(RELEASE) \ - > $(NAME)-$(VERSION)-$(RELEASE).$(SUFFIX).log 2>&1 || notify-send "Error" - mv $(NAME)-$(VERSION)-$(RELEASE).iso $(NAME)-$(VERSION)-$(RELEASE).$(SUFFIX).iso - notify-send "Check ISO" - -nightly-iso: - cp -f /usr/share/spin-kickstarts/fedora-live-base.ks kickstart/ovirt-live-base.ks - sed -i -e 's/selinux \-\-enforcing/selinux \-\-permissive/g' \ - -e 's/services \-\-enabled\=NetworkManager \-\-disabled\=network\,sshd/services \-\-enabled\=NetworkManager\,sshd \-\-disabled\=network\,firewalld\nrepo \-\-name\=ovirt \-\-baseurl\=http:\/\/ovirt.org\/releases\/nightly\/rpm\/Fedora\/19/g' \ - -e 's/liveuser/oVirtuser/g' \ - -e 's/firewall \-\-enabled/firewall \-\-disabled/g' \ - -e 's/livedir\=\"LiveOS\"/livedir\=\"LiveoVirt\"/g' \ - -e "s/\(^.*stop.*atd\..*:\)/\1\nmodprobe dummy/g" kickstart/ovirt-live-base.ks - - wget -N http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/TinyCore-current.iso - mkdir oVirtLiveFiles/iso - - mv -f *.iso oVirtLiveFiles/iso - - livecd-creator -d -v \ - --config=kickstart/ovirt.ks \ - --cache=/home \ - --fslabel=$(NAME)-$(VERSION)-$(RELEASE) \ - > $(NAME)-$(VERSION)-$(RELEASE).$(SUFFIX).log 2>&1 - mv $(NAME)-$(VERSION)-$(RELEASE).iso $(NAME)-$(VERSION)-$(RELEASE).$(SUFFIX).iso diff --git a/fedora/kickstart/ovirt.ks b/fedora/kickstart/ovirt.ks deleted file mode 100644 index e018cd2..0000000 --- a/fedora/kickstart/ovirt.ks +++ /dev/null @@ -1,149 +0,0 @@ -# Maintained by the Fedora Desktop SIG: -# http://fedoraproject.org/wiki/SIGs/Desktop -# mailto:[email protected] - -%include ovirt-live-base.ks - -part / --size 16000 -rootpw --iscrypted $1$Idf9Mf5B$lmQBHtDcnO4Xd53vqFWqT. -authconfig --enableshadow --passalgo=sha512 --enablefingerprint -timezone --utc Asia/Jerusalem - -%packages -##@sound-and-video -@gnome-desktop -ovirt-engine-setup-plugin-allinone -ovirt-engine-cli -#ovirt-node-iso -spice-xpi --freeipa-server - -# misc -chkconfig -system-config-firewall-base -cyrus-sasl -rpcbind -initscripts -patch -bridge-utils -net-tools -firefox - -# Missing from vdsBootsrap -m2crypto -seabios -vdsm-cli -vdsm-xmlrpc -ovirt-host-deploy-offline -qemu-kvm-tools -vim -yad -net-tools -bridge-utils -shadow-utils - -# FIXME; apparently the glibc maintainers dislike this, but it got put into the -# desktop image at some point. We won't touch this one for now. -nss-mdns - -# This one needs to be kicked out of @base --smartmontools - -# The gnome-shell team does not want extensions in the default spin; --biosdevname -# rebranding -#-fedora-logos -#-fedora-release -#-fedora-release-notes -#generic-release -#generic-logos -#generic-release-notes - -%end - -%post #--nochroot --log=/tmp/my-post-log -#!/bin/sh -set -x -v - -echo "Starting post secion" -echo "Adding user" -/sbin/useradd oVirtuser && echo oVirtuser | passwd oVirtuser --stdin -mkdir -p /root/oVirtLiveFiles ~oVirtuser/.config/autostart - -cat >> /etc/rc.d/init.d/livesys << EOF - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # Need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop -fi - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -EOF - -# Configure autologin -sed -i 's/\[daemon\]/\[daemon\]\nAutomaticLoginEnable\=True\nAutomaticLogin\=oVirtuser/g' /etc/gdm/custom.conf - -# Add oVirtuser to sudoers -/sbin/usermod -g wheel oVirtuser - -sed -i 's/utils.retry(isHostUp, tries=20, timeout=150, sleep=5)/utils.retry(isHostUp, tries=100, timeout=600, sleep=5)/g' /usr/share/ovirt-engine/scripts/plugins/all_in_one_100.py -# No reboot is needed in AIO, so manager should not wait -sed -i "s/'ServerRebootTimeout','300'/'ServerRebootTimeout','0'/g" /usr/share/ovirt-engine/dbscripts/upgrade/pre_upgrade/0000_config.sql -# Allow wlan* on host (as we're running locally) -sed -i -e 's/# hidden_nics = wlan\*,usb\*/hidden_nics = usb\*/' -e 's/\[vars\]/\[vars\]\nfake_nics\ \=\ \dummy0/g' /etc/vdsm/vdsm.conf -%end - -%post --nochroot -cp -r oVirtLiveFiles $INSTALL_ROOT/root -%end - -# Last misc changes here: -%post -mkdir -p /home/oVirtuser -cp -r /root/oVirtLiveFiles /home/oVirtuser -# gsettings set org.gnome.desktop.background picture-uri 'file:////home/oVirtuser/oVirtLiveFiles/ovirt-wallpaper-16:9.jpg' -rm -rf /root/oVirtLiveFiles -chmod o+x /home/oVirtuser/oVirtLiveFiles/engine-setup-yad.sh -chown -R oVirtuser:oVirtuser /home/oVirtuser -echo 'user_pref("browser.startup.homepage", "http://localhost.localdomain";);' >> /home/oVirtuser/.mozilla/firefox/*.default/prefs.js - -find /home/oVirtuser/oVirtLiveFiles/patches -name '*.patch' | sort | while read patch; do - patch -d /usr/share/ovirt-engine/scripts < "$patch" -done - -# Configuring autologin -sed -i 's/\[daemon\]/\[daemon\]\nAutomaticLoginEnable\=True\nAutomaticLogin\=oVirtuser/g' /etc/gdm/custom.conf - -echo '10.0.0.1 ovirtlive.localdomain localdomain' >> /etc/hosts - -# Setting wallapaper -cp /home/oVirtuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png -cp /home/oVirtuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg /usr/share/backgrounds/spherical-cow/default/wide/spherical-cow.png -cp /home/oVirtuser/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg /usr/share/backgrounds/spherical-cow/default/normalish/spherical-cow.png - -# Link setup in autostart -ln -s /usr/share/applications/engine-setup.desktop ~oVirtuser/.config/autostart/engine-setup.desktop - -glib-compile-schemas /usr/share/glib-2.0/schemas - -sed -i 's/#WDMDOPTS/WDMDOPTS/g' /etc/sysconfig/wdmd -yum localinstall -y /home/oVirtuser/oVirtLiveFiles/rpms/*.rpm - -umask 0027 - -# Updating patched files -cp -r /home/oVirtuser/root/* / - -# Manipulate fqdn validation, so that it is possible to setup with answer file -sed -i 's/raise Exception(output_messages.ERR_EXP_VALIDATE_PARAM % param.getKey("CONF_NAME"))/logging.debug("Failed to validate %s with value %s",param,paramValue)/g' /usr/share/ovirt-engine/scripts/engine-setup.py -sed -i -e 's/\(^SELINUX=\).*$/\1permissive/' /etc/selinux/config - -echo "Finishing post section" -%end diff --git a/fedora/oVirtLiveFiles/desktop-backgrounds-spherical-cow.xml b/fedora/oVirtLiveFiles/desktop-backgrounds-spherical-cow.xml deleted file mode 100644 index 8c28c90..0000000 --- a/fedora/oVirtLiveFiles/desktop-backgrounds-spherical-cow.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd"> -<wallpapers> - <wallpaper deleted="false"> - <name>Spherical Cow</name> - <filename>/home/oVirtuser/oVirtLiveFiles/ovirt-wallpaper-16:9.jpg</filename> - <options>stretched</options> - </wallpaper> -</wallpapers> diff --git a/fedora/oVirtLiveFiles/engine-setup-yad.sh b/fedora/oVirtLiveFiles/engine-setup-yad.sh deleted file mode 100755 index 0288b9c..0000000 --- a/fedora/oVirtLiveFiles/engine-setup-yad.sh +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/bash -# TODO - -sudo ifconfig dummy0 10.0.0.1 netmask 255.255.255.0 > /dev/null -sudo ifup ovirtmgmt > /dev/null -sudo brctl addbr ovirtmgmt > /dev/null -sudo brctl addif ovirtmgmt dummy0 > /dev/null - -action=$(yad --entry \ - --title "oVirt installation" \ - --text "oVirt allInOne is going to be installed\nChoose which option you would like to install\nINFO: all passwords on the live system are: \"ovirt\"" \ - --on-top \ - --center\ - --text-align=center \ - --image=/home/oVirtuser/oVirtLiveFiles/images/ovirt-usb-stick.svg \ - --skip-taskbar \ - --image-on-top \ - --listen \ - --borders=3 \ - --button="gtk-ok:0" --button="gtk-close:1" \ - --entry-text \ - "automatic" "interactive") -ret=$? - -[[ $ret -eq 1 ]] && exit 0 - -if [[ $ret -eq 2 ]]; then - gdmflexiserver --startnew & - exit 0 -fi - -case $action in - automatic*) cmd="sudo /usr/bin/engine-setup --answer-file=/home/oVirtuser/oVirtLiveFiles/ovirt-answer" ;; - interactive*) cmd="gnome-terminal --command=\"sudo /usr/bin/engine-setup\";sleep 20" ;; - *) exit 1 ;; -esac - -echo "excecuting $cmd" -$cmd -if [[ $? -eq 0 ]]; then - echo "setup ended successfully" - rm -f ~oVirtuser/.config/autostart/engine-setup.desktop - yad --text "setup ended successfully\nopening ovirt-engine now on htts://localhost.localdomain" --button="gtk-ok:0" - /bin/firefox https://localhost.localdomain & - exit 0 -fi diff --git a/fedora/oVirtLiveFiles/images/ovirt-icon-128.png b/fedora/oVirtLiveFiles/images/ovirt-icon-128.png deleted file mode 100644 index a735b0e..0000000 --- a/fedora/oVirtLiveFiles/images/ovirt-icon-128.png +++ /dev/null Binary files differ diff --git a/fedora/oVirtLiveFiles/images/ovirt-setup.png b/fedora/oVirtLiveFiles/images/ovirt-setup.png deleted file mode 100644 index bbfaa98..0000000 --- a/fedora/oVirtLiveFiles/images/ovirt-setup.png +++ /dev/null Binary files differ diff --git a/fedora/oVirtLiveFiles/images/ovirt-usb-stick.png b/fedora/oVirtLiveFiles/images/ovirt-usb-stick.png deleted file mode 100644 index a304297..0000000 --- a/fedora/oVirtLiveFiles/images/ovirt-usb-stick.png +++ /dev/null Binary files differ diff --git a/fedora/oVirtLiveFiles/images/ovirt-usb-stick.svg b/fedora/oVirtLiveFiles/images/ovirt-usb-stick.svg deleted file mode 100644 index 5b9e050..0000000 --- a/fedora/oVirtLiveFiles/images/ovirt-usb-stick.svg +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns="http://www.w3.org/2000/svg"; sodipodi:docname="ovirt-usb-stick.svg" inkscape:export-filename="./ovirt-usb-stick.png" height="58.5" width="108" inkscape:export-xdpi="1200" version="1.1" inkscape:export-ydpi="1200" xmlns:cc="http://creativecommons.org/ns#"; xmlns:dc="http://purl.org/dc/elements/1.1/"; inkscape:version="0.48.2 r9819" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";> - <sodipodi:namedview fit-margin-left="0" inkscape:showpageshadow="false" inkscape:zoom="1.07" borderopacity="1.0" inkscape:current-layer="layer1" inkscape:cx="42.383179" inkscape:cy="-98.065424" inkscape:window-maximized="1" showgrid="false" fit-margin-right="0" units="in" inkscape:document-units="px" bordercolor="#666666" inkscape:window-x="1366" inkscape:window-y="27" fit-margin-bottom="0" inkscape:window-width="1920" inkscape:pageopacity="0.0" inkscape:pageshadow="2" pagecolor="#ffffff" inkscape:window-height="1020" fit-margin-top="0"/> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <g inkscape:label="Layer 1" inkscape:groupmode="layer" transform="translate(-262.62 -167.69)"> - <g transform="matrix(.36198 0 0 .36198 221.17 29.063)"> - <g> - <path d="m183.44 448.74c-15.319 0-27.741 12.032-27.741 26.863s12.422 26.83 27.741 26.83 27.707-11.999 27.707-26.83-12.388-26.863-27.707-26.863zm0 4.2523c9.6827 0 17.515 10.137 17.515 22.611s-7.8325 22.577-17.515 22.577c-9.6827 0-17.549-10.104-17.549-22.577 0-12.474 7.8663-22.611 17.549-22.611z" inkscape:connector-curvature="0"/> - <path d="m199.41 425.11 5.8044 3.9091c5.3244 12.262 10.419 24.624 15.281 37.077 4.5483 11.65 8.8927 23.38 13.03 35.182h7.2259l14.807-37.907c4.7268-12.101 9.6215-24.143 15.163-35.893l2.6061-2.3692h-7.5813l0.11845 0.59228c-3.6747 10.784-7.5851 21.489-11.727 32.102-4.1514 10.637-8.5358 21.183-13.149 31.628l-1.5399-0.23692c-3.7861-9.4232-7.5373-18.86-11.254-28.311-4.4328-11.274-8.8158-22.567-13.149-33.879l-0.11846-1.8953h-15.518" sodipodi:nodetypes="ccccccccccccccccc" inkscape:path-effect="#path-effect3109" inkscape:connector-curvature="0" inkscape:original-d="m 199.40597,425.11417 c 1.93482,1.30303 3.86963,2.60607 5.80444,3.90911 l 15.28109,37.07737 13.03039,35.18204 7.22594,0 14.80726,-37.90657 c 4.73832,-12.31963 12.20119,-29.9699 15.16264,-35.89279 l 2.60607,-2.36916 -7.58131,0 0.11845,0.59228 -11.72734,32.10214 -13.14886,31.6283 -1.53994,-0.23692 -11.25352,-28.31147 -13.14885,-33.87901 c -0.11846,-0.71075 -0.11846,-1.30304 -0.11846,-1.89532 l -15.518,0" stroke-width="0! "/> - <path d="m268.64 451.41c2.4809 2.1321 8.5254 4.421 8.6474 7.9367v41.934h9.7136v-51.885l-0.11846-0.5923-18.243 2.6061m20.221-18.486c0 3.5786-2.901 6.4796-6.4796 6.4796s-6.4796-2.901-6.4796-6.4796 2.901-6.4796 6.4796-6.4796 6.4796 2.901 6.4796 6.4796z" inkscape:connector-curvature="0" stroke-width="0"/> - <path d="m311.12 448.81-16.703 2.6061c3.9091 2.7245 8.4105 5.4491 8.4105 7.9367v41.934h9.5951v-33.524c0-8.0551 4.7383-10.78 7.9367-10.78 2.0138 0 4.0276-0.35536 7.9367 1.4215 1.4215 1.1846 1.303 4.2645 1.7769 4.2645l4.8568-8.7659c0-2.2507-1.4215-5.0937-5.3306-5.0937-4.7383 0-8.6474 2.2507-17.176 8.4105l-1.303-8.4105" inkscape:connector-curvature="0" stroke-width="0"/> - <path d="m371.66 454.25v-4.146h-15.992v-19.901h-1.7769c-1.4215 7.1075-3.4353 15.163-7.5813 19.901h-8.8844v4.146h8.8844v36.485c0 10.543 8.4105 11.727 12.083 11.727l12.32-5.3306h-5.9229c-4.7383 0-9.1213-2.4876-9.1213-10.424v-32.458h15.992" inkscape:connector-curvature="0" stroke-width="0"/> - </g> - </g> - </g> -</svg> diff --git a/fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg b/fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg deleted file mode 100644 index 09d7d95..0000000 --- a/fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:10.jpg +++ /dev/null Binary files differ diff --git a/fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg b/fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg deleted file mode 100644 index eafb4f4..0000000 --- a/fedora/oVirtLiveFiles/images/ovirt-wallpaper-16:9.jpg +++ /dev/null Binary files differ diff --git a/fedora/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg b/fedora/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg deleted file mode 100644 index 7b01cd0..0000000 --- a/fedora/oVirtLiveFiles/images/ovirt-wallpaper-4:3.jpg +++ /dev/null Binary files differ diff --git a/fedora/oVirtLiveFiles/ovirt-answer b/fedora/oVirtLiveFiles/ovirt-answer deleted file mode 100644 index cb927b2..0000000 --- a/fedora/oVirtLiveFiles/ovirt-answer +++ /dev/null @@ -1,31 +0,0 @@ -[environment:default] -OSETUP_RPMDISTRO/enableUpgrade=bool:False -OVESETUP_CORE/engineStop=none:None -OVESETUP_DIALOG/confirmSettings=bool:True -OVESETUP_DB/database=str:engine -OVESETUP_DB/fixDbViolations=none:None -OVESETUP_DB/secured=bool:False -OVESETUP_DB/securedHostValidation=bool:False -OVESETUP_DB/host=str:localhost -OVESETUP_DB/user=str:engine -OVESETUP_DB/password=str:123456 -OVESETUP_DB/port=int:5432 -OVESETUP_SYSTEM/nfsConfigEnabled=bool:True -OVESETUP_PKI/organization=str:ovirt.org -OVESETUP_CONFIG/isoDomainName=str:ISO_DOMAIN -OVESETUP_CONFIG/isoDomainMountPoint=str:/var/lib/exports/iso -OVESETUP_CONFIG/adminPassword=str:123456 -OVESETUP_CONFIG/applicationMode=str:virt -OVESETUP_CONFIG/firewallManager=str:firewalld -OVESETUP_CONFIG/websocketProxyConfig=none:None -OVESETUP_CONFIG/fqdn=str:dhcp-1-12.tlv.redhat.com -OVESETUP_CONFIG/storageType=str:nfs -OVESETUP_PROVISIONING/postgresProvisioningEnabled=bool:True -OVESETUP_APACHE/configureRootRedirection=bool:True -OVESETUP_APACHE/configureSsl=bool:True -OSETUP_RPMDISTRO/requireRollback=none:None -OSETUP_RPMDISTRO/enableUpgrade=none:None -OVESETUP_AIO/configure=bool:True -OVESETUP_AIO/storageDomainDir=str:/var/lib/images -OVESETUP_AIO/rootPassword=str:ovirt - diff --git a/fedora/oVirtLiveFiles/patches/0001-oVirtLive-patches.patch b/fedora/oVirtLiveFiles/patches/0001-oVirtLive-patches.patch deleted file mode 100644 index 75dde25..0000000 --- a/fedora/oVirtLiveFiles/patches/0001-oVirtLive-patches.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 34ff79b34bab6b1ace4e83c5eb3c6fcec2b62538 Mon Sep 17 00:00:00 2001 -From: Ohad Basan <[email protected]> -Date: Wed, 2 Jan 2013 11:26:18 +0200 -Subject: [PATCH] oVirtLive patches - -Change-Id: I6cbe56f6ce1bd62e40877b845765c8b75145f34c ---- - packaging/fedora/setup/common_utils.py | 2 +- - packaging/fedora/setup/engine-setup.py | 6 +++--- - packaging/fedora/setup/engine_validators.py | 1 + - packaging/fedora/setup/nfsutils.py | 1 + - 4 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/packaging/fedora/setup/common_utils.py b/packaging/fedora/setup/common_utils.py -index 2507d28..e59f23f 100755 ---- a/packaging/fedora/setup/common_utils.py -+++ b/packaging/fedora/setup/common_utils.py -@@ -1276,7 +1276,7 @@ def getRpmVersion(rpmName=basedefs.ENGINE_RPM_NAME): - - def installed(rpm): - try: -- getRpmVersion(rpmName=rpm) -+ #getRpmVersion(rpmName=rpm) - return True - except: - logging.debug("getRpmVersion failed", exc_info=True) -diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py -index f347e78..57382fe 100755 ---- a/packaging/fedora/setup/engine-setup.py -+++ b/packaging/fedora/setup/engine-setup.py -@@ -675,6 +675,7 @@ def _backupOldHttpdConfig(): - - - def _configureSelinuxBoolean(): -+ return - logging.debug("Enable httpd_can_network_connect boolean") - cmd = [ - basedefs.EXEC_SEMANAGE, -@@ -1024,7 +1025,7 @@ def _upgradeDB(): - currentDbName = basedefs.DB_NAME - - # Update rpm version in vdc options -- utils.updateVDCOption("ProductRPMVersion", utils.getRpmVersion(basedefs.ENGINE_RPM_NAME)) -+ #utils.updateVDCOption("ProductRPMVersion", utils.getRpmVersion(basedefs.ENGINE_RPM_NAME)) - except: - # Upgrade failed! we need to restore the old db - logging.debug("DB upgrade failed, restoring it to a previous state. DB was backed up to %s", dbBackupFile) -@@ -1088,7 +1089,6 @@ def _updateVDCOptions(): - "DataDir":["/usr/share/ovirt-engine", 'text'], - "SignScriptName":["SignReq.sh", 'text'], - "OrganizationName":[controller.CONF["ORG_NAME"], 'text'], -- "ProductRPMVersion":[utils.getRpmVersion(basedefs.ENGINE_RPM_NAME), 'text'], - "AdminPassword":[controller.CONF["AUTH_PASS"], 'pass'] - } - ) -@@ -1971,7 +1971,7 @@ def main(configFile=None): - runSequences() - - # Lock rhevm version -- utils.lockRpmVersion(miniyum, basedefs.RPM_LOCK_LIST.split()) -+ #utils.lockRpmVersion(miniyum, basedefs.RPM_LOCK_LIST.split()) - - # Print info - _addFinalInfoMsg() -diff --git a/packaging/fedora/setup/engine_validators.py b/packaging/fedora/setup/engine_validators.py -index 0b8f5e2..68a5b67 100644 ---- a/packaging/fedora/setup/engine_validators.py -+++ b/packaging/fedora/setup/engine_validators.py -@@ -558,6 +558,7 @@ def _isPathWriteable(path): - return False - - def validateIpaAndHttpdStatus(conf): -+ return True - """" - This function serve as a pre-condition to the ports group. This function will always return True, - Therefore the ports group will always be handled, but this function may changes the flow dynamically -diff --git a/packaging/fedora/setup/nfsutils.py b/packaging/fedora/setup/nfsutils.py -index e904f2e..65adbe5 100644 ---- a/packaging/fedora/setup/nfsutils.py -+++ b/packaging/fedora/setup/nfsutils.py -@@ -33,6 +33,7 @@ def addNfsExport(path, authInfo, comment=None, exportFilePath=basedefs.FILE_ETC_ - exportFile.close() - - def setSELinuxContextForDir(path, contextName): -+ return - logging.debug("setting selinux context for %s" % path) - if path.endswith("/"): - path = path[:-1] --- -1.7.11.7 - diff --git a/fedora/oVirtLiveFiles/root/etc/gdm/custom.conf b/fedora/oVirtLiveFiles/root/etc/gdm/custom.conf deleted file mode 100644 index 124f82b..0000000 --- a/fedora/oVirtLiveFiles/root/etc/gdm/custom.conf +++ /dev/null @@ -1,4 +0,0 @@ -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=oVirtuser - diff --git a/fedora/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf b/fedora/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf deleted file mode 100644 index ada282b..0000000 --- a/fedora/oVirtLiveFiles/root/etc/ovirt-host-deploy.conf.d/50-vdsm-conf-fake-nic.conf +++ /dev/null @@ -1,2 +0,0 @@ -[environment:init] -VDSM_CONFIG/vars/fake_nics=str:dummy0 diff --git a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 b/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 deleted file mode 100644 index afae7d6..0000000 --- a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-dummy0 +++ /dev/null @@ -1,8 +0,0 @@ -DEVICE=dummy0 -BOOTPROTO=none -ONBOOT=yes -HOTPLUG=no -NM_CONTROLLED=no -BRIDGE=ovirtmgmt -PROMISC=yes - diff --git a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 b/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 deleted file mode 100644 index 96d760f..0000000 --- a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-eth0 +++ /dev/null @@ -1,4 +0,0 @@ -DEVICE=eth0 -BOOTPROTO=none -ONBOOT=yes - diff --git a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt b/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt deleted file mode 100644 index 136b3ad..0000000 --- a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-ovirtmgmt +++ /dev/null @@ -1,9 +0,0 @@ -DEVICE=ovirtmgmt -TYPE=Bridge -BOOTPROTO=static -ONBOOT=yes -DELAY=0 -NM_CONTROLLED=no -IPADDR=10.0.0.1 -NETMASK=255.255.255.0 - diff --git a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 b/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 deleted file mode 100644 index d6903d4..0000000 --- a/fedora/oVirtLiveFiles/root/etc/sysconfig/network-scripts/ifcfg-wlan0 +++ /dev/null @@ -1,4 +0,0 @@ -DEVICE=wlan0 -BOOTPROTO=dhcp -ONBOOT=yes - diff --git a/fedora/oVirtLiveFiles/root/etc/yum.repos.d/ovirt.repo b/fedora/oVirtLiveFiles/root/etc/yum.repos.d/ovirt.repo deleted file mode 100644 index 5c72fb0..0000000 --- a/fedora/oVirtLiveFiles/root/etc/yum.repos.d/ovirt.repo +++ /dev/null @@ -1,21 +0,0 @@ -[ovirt-stable] -name=Stable builds of the oVirt project -baseurl=http://ovirt.org/releases/stable/rpm/Fedora/18/ -enabled=0 -skip_if_unavailable=1 -gpgcheck=0 - -[ovirt-beta] -name=Beta builds of the oVirt project -baseurl=http://ovirt.org/releases/beta/rpm/Fedora/18/ -enabled=1 -skip_if_unavailable=1 -gpgcheck=0 - -[ovirt-nightly] -name=Nightly builds of the oVirt project -baseurl=http://ovirt.org/releases/nightly/rpm/Fedora/18/ -enabled=0 -skip_if_unavailable=1 -gpgcheck=0 - diff --git a/fedora/oVirtLiveFiles/root/usr/share/applications/engine-setup.desktop b/fedora/oVirtLiveFiles/root/usr/share/applications/engine-setup.desktop deleted file mode 100644 index 1f7eda2..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/applications/engine-setup.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Version=1.0 -Name=oVirt-setup -Name[en_US]=oVirt-setup -Exec=/usr/bin/gnome-terminal -e "bash -c /home/oVirtuser/oVirtLiveFiles/engine-setup-yad.sh;bash" -X-GNOME-Autostart-enabled=true -X-GNOME-Autostart-Delay=5 -Icon=/home/oVirtuser/oVirtLiveFiles/images/ovirt-setup.png - diff --git a/fedora/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop b/fedora/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop deleted file mode 100644 index 1022bbe..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/applications/ovirt.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Version=1.0 -Name=oVirt-Engine -Exec=/bin/firefox https://localhost.localdomain -X-GNOME-Autostart-enabled=true -X-GNOME-Autostart-Delay=10 -StartupNotify=true -Icon=/home/oVirtuser/oVirtLiveFiles/images/ovirt-icon-128.png - diff --git a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override b/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override deleted file mode 100644 index 18d7f9b..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override +++ /dev/null @@ -1,3 +0,0 @@ -[org.gnome.desktop.lockdown] -disable-lock-screen=true - diff --git a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override b/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override deleted file mode 100644 index ae0eca4..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override +++ /dev/null @@ -1,3 +0,0 @@ -[org.gnome.desktop.screensaver] -lock-enabled=false - diff --git a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override b/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override deleted file mode 100644 index 0799bc6..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override +++ /dev/null @@ -1,3 +0,0 @@ -[org.gnome.settings-daemon.plugins.updates] -active=false - diff --git a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override b/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override deleted file mode 100644 index 04bbf8d..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override +++ /dev/null @@ -1,3 +0,0 @@ -[org.gnome.shell] -favorite-apps=['ovirt.desktop' , 'engine-setup.desktop','firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'shotwell.desktop', 'nautilus.desktop', 'anaconda.desktop'] - diff --git a/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py b/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py deleted file mode 100644 index 7e34015..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/__init__.py +++ /dev/null @@ -1,35 +0,0 @@ -# -# ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -""" -ovirt-host-setup ovirtLive plugin. -""" - - -from otopi import util - - -from . import core - - [email protected] -def createPlugins(context): - core.Plugin(context=context) - - -# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py b/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py deleted file mode 100644 index 675a5f5..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/core.py +++ /dev/null @@ -1,233 +0,0 @@ -# -# ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -""" -oVirtLive plugin. -""" - -import time -import os -import shutil -import glob -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') - - -from otopi import util -from otopi import plugin -from otopi import filetransaction -from otopi import constants as otopicons - - -import oliveconst - - -from ovirt_engine_setup import util as osetuputil -from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup import dialog - - [email protected] -class Plugin(plugin.PluginBase): - """ - oVirtLive plugin. - """ - - def __init__(self, context): - super(Plugin, self).__init__(context=context) - self._enabled = True - - @plugin.event( - stage=plugin.Stages.STAGE_INIT, - ) - def _init(self): - self.environment.setdefault( - oliveconst.CoreEnv.ENABLE - ) - self.environment.setdefault( - oliveconst.IsoEnv.ISO_NAME, - oliveconst.Defaults.DEFAULT_ISO_NAME - ) - - @plugin.event( - stage=plugin.Stages.STAGE_SETUP, - condition=lambda self: self.environment[ - oliveconst.CoreEnv.ENABLE - ], - ) - def _setup(self): - self._enabled = True - - @plugin.event( - stage=plugin.Stages.STAGE_VALIDATION, - ) - def _validation(self): - import ovirtsdk.api - import ovirtsdk.xml - self._ovirtsdk_api = ovirtsdk.api - self._ovirtsdk_xml = ovirtsdk.xml - - @plugin.event( - stage=plugin.Stages.STAGE_CLOSEUP, - condition=lambda self: self._enabled, - name=oliveconst.Stages.INIT, - before=( - oliveconst.Stages.CONFIG_STORAGE, - ), - after=( - osetupcons.Stages.AIO_CONFIG_VDSM, - ), - ) - def _initapi(self): - self._engine_api = self._ovirtsdk_api.API( - url='https://{fqdn}:{port}/api'.format( - fqdn=self.environment[osetupcons.ConfigEnv.FQDN], - port=self.environment[osetupcons.ConfigEnv.PUBLIC_HTTPS_PORT], - ), - username='{user}@{domain}'.format( - user=osetupcons.Const.USER_ADMIN, - domain=osetupcons.Const.DOMAIN_INTERNAL, - ), - password=self.environment[osetupcons.ConfigEnv.ADMIN_PASSWORD], - ca_file=osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_CA_CERT, - ) - - @plugin.event( - stage=plugin.Stages.STAGE_CLOSEUP, - condition=lambda self: self._enabled, - name=oliveconst.Stages.CONFIG_STORAGE, - before=( - oliveconst.Stages.COPY_ISO, - ), - after=( - oliveconst.Stages.INIT, - ), - ) - def _createstorage(self): - self.logger.debug('Attaching iso domain') - time.sleep(10) - self._engine_api.datacenters.get( - self.environment[ - oliveconst.CoreEnv.LOCAL_DATA_CENTER - ] - ).storagedomains.add( - self._engine_api.storagedomains.get( - self.environment[ - oliveconst.IsoEnv.ISO_NAME - ] - ) - ) - - @plugin.event( - stage=plugin.Stages.STAGE_CLOSEUP, - condition=lambda self: self._enabled, - name=oliveconst.Stages.COPY_ISO, - before=( - oliveconst.Stages.CREATE_VM, - ), - after=( - oliveconst.Stages.CONFIG_STORAGE, - ), - ) - def _copyiso(self): - self.logger.debug('Copying Iso Files') - fileList = glob.glob('/home/oVirtuser/oVirtLiveFiles/iso/*.iso') - targetPath = os.path.join( - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_NFS_MOUNT_POINT - ], - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_SD_UUID - ], - 'images', - osetupcons.Const.ISO_DOMAIN_IMAGE_UID - ) - self.logger.debug('target path' + targetPath) - for filename in fileList: - self.logger.debug(filename) - shutil.move(filename, targetPath) - os.chown( - os.path.join(targetPath, os.path.basename(filename)), - osetuputil.getUid( - osetupcons.Defaults.DEFAULT_SYSTEM_USER_VDSM - ), - osetuputil.getGid( - osetupcons.Defaults.DEFAULT_SYSTEM_GROUP_KVM - ) - ) - - @plugin.event( - stage=plugin.Stages.STAGE_CLOSEUP, - condition=lambda self: self._enabled, - name=oliveconst.Stages.CREATE_VM, - after=( - oliveconst.Stages.COPY_ISO, - ), - ) - def _createvm(self): - # Defins OS param for the boot option - params = self._ovirtsdk_xml.params - os = params.OperatingSystem( - type_='unassigned', - boot=( - params.Boot(dev='cdrom'), - params.Boot(dev='hd'), - ), - ) - MB = 1024*1024 - GB = 1024*MB - - # Create VM - vm = self._engine_api.vms.add( - params.VM( - name='local_vm', - memory=1*GB, - os=os, - cluster=self._engine_api.clusters.get('local_cluster'), - template=self._engine_api.templates.get('Blank'), - ), - ) - - # Create NIC - self._engine_api.vms.get('local_vm').nics.add( - params.NIC( - name='eth0', - network=params.Network(name='ovirtmgmt'), - interface='virtio', - ), - ) - - diskParam = params.Disk( - storage_domains=params.StorageDomains( - storage_domain=( - self._engine_api.storagedomains.get('local_storage'), - ), - ), - size=6*GB, - type_='data', - interface='virtio', - format='cow', - bootable=True, - ) - - self._engine_api.vms.get( - 'local_vm' - ).disks.add(diskParam) - - -# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py b/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py deleted file mode 100644 index e86e683..0000000 --- a/fedora/oVirtLiveFiles/root/usr/share/ovirt-engine/setup/plugins/ovirt-engine-setup/olive/oliveconst.py +++ /dev/null @@ -1,80 +0,0 @@ -# -# ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') - -from otopi import util -from ovirt_engine_setup import constants as osetupcons - - [email protected] -class Stages(object): - CONFIG_STORAGE = 'ovirtlivesetup.core.core.configstorage' - COPY_ISO = 'ovirtlivesetup.core.copy.iso' - CREATE_VM = 'ovirtlivesetup.core.create.vm' - INIT = 'ovirtlivesetup.core.init' - - [email protected] [email protected] [email protected] -class CoreEnv(object): - ENABLE = 'OVESETUP_OVIRTLIVE/enable' - - CONFIGURE = 'OVESETUP_OL/configure' - LOCAL_DATA_CENTER = 'OVESETUP_AIO/localDataCenter' - LOCAL_CLUSTER = 'OVESETUP_AIO/localCluster' - LOCAL_HOST = 'OVESETUP_AIO/localHost' - VDSM_CPU = 'OVESETUP_AIO/vdsmCpu' - - STORAGE_DOMAIN_SD_UUID = 'OVESETUP_AIO/storageDomainSdUuid' - STORAGE_DOMAIN_DEFAULT_DIR = 'OVESETUP_AIO/storageDomainDefaultDir' - - @osetupcons.osetupattrs( - answerfile=True, - summary=True, - description=_('Local storage domain directory'), - ) - def STORAGE_DOMAIN_DIR(self): - return 'OVESETUP_AIO/storageDomainDir' - - STORAGE_DOMAIN_NAME = 'OVESETUP_AIO/storageDomainName' - - [email protected] [email protected] -class Defaults(object): - DEFAULT_LOCAL_DATA_CENTER = 'local_datacenter' - DEFAULT_LOCAL_CLUSTER = 'local_cluster' - DEFAULT_LOCAL_HOST = 'local_host' - DEFAULT_STORAGE_DOMAIN_NAME = 'local_storage' - DEFAULT_ISO_NAME = 'ISO_DOMAIN' - [email protected] [email protected] [email protected] -class IsoEnv(object): - ISO_NAME = 'ISO_DOMAIN' - [email protected] [email protected] -class Const(object): - MINIMUM_SPACE_STORAGEDOMAIN_MB = 10240 - - -# vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/19566 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2c2785e0c3245d2275d52cb2d165af63a74c89b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-live Gerrit-Branch: master Gerrit-Owner: Ohad Basan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
