diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/PR_revision.log | 1 | ||||
| -rwxr-xr-x | ci/clean.sh | 13 | ||||
| -rwxr-xr-x | ci/deploy.sh | 14 | ||||
| -rw-r--r-- | ci/iso-verify.ks | 57 | ||||
| -rwxr-xr-x | ci/util.sh | 13 |
5 files changed, 59 insertions, 39 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 067aa8b2..58f3edad 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -15,3 +15,4 @@ 120,Add old openflow port (6633) and karaf ssh port (8101) 123,Disable L3 HA for ODL/FDIO scenarios 124,setting keystone region for tacker and congress +111,Backporting OVN fixes diff --git a/ci/clean.sh b/ci/clean.sh index 262e74bf..4335b821 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -12,19 +12,6 @@ #author: Dan Radez (dradez@redhat.com) #author: Tim Rozet (trozet@redhat.com) -# Backwards compat for old ENV Vars -# Remove in E Release -if [ -n "$CONFIG" ]; then - echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}" - echo -e "${red}WARNING: CONFIG will be removed in E${reset}" - BASE=$CONFIG -fi -if [ -n "$RESOURCES" ]; then - echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}" - echo -e "${red}WARNING: RESOURCES will be removed in E${reset}" - IMAGES=$RESOURCES -fi - # Use default if no param passed BASE=${BASE:-'/var/opt/opnfv'} IMAGES=${IMAGES:-"$BASE/images"} diff --git a/ci/deploy.sh b/ci/deploy.sh index 4df2d6a8..dd038643 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -37,19 +37,6 @@ declare -A deploy_options_array declare -a performance_options declare -A NET_MAP -# Backwards compat for old ENV Vars -# Remove in E Release -if [ -n "$CONFIG" ]; then - echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}" - echo -e "${red}WARNING: CONFIG will be removed in E${reset}" - BASE=$CONFIG -fi -if [ -n "$RESOURCES" ]; then - echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}" - echo -e "${red}WARNING: RESOURCES will be removed in E${reset}" - IMAGES=$RESOURCES -fi - APEX_TMP_DIR=$(python3 -c "import tempfile; print(tempfile.mkdtemp())") SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error) DEPLOY_OPTIONS="" @@ -103,6 +90,7 @@ display_usage() { echo -e " --debug : enable debug output." echo -e " --interactive : enable interactive deployment mode which requires user to confirm steps of deployment." echo -e " --virtual-cpus : Number of CPUs to use per Overcloud VM in a virtual deployment (defaults to 4)." + echo -e " --virtual-computes : Number of Virtual Compute nodes to create and use during deployment (defaults to 1 for noha and 2 for ha)." echo -e " --virtual-default-ram : Amount of default RAM to use per Overcloud VM in GB (defaults to 8)." echo -e " --virtual-compute-ram : Amount of RAM to use per Overcloud Compute VM in GB (defaults to 8). Overrides --virtual-default-ram arg for computes" } diff --git a/ci/iso-verify.ks b/ci/iso-verify.ks new file mode 100644 index 00000000..f3e975c5 --- /dev/null +++ b/ci/iso-verify.ks @@ -0,0 +1,57 @@ +# poweroff on success +poweroff + +# Do not configure the X Window System +skipx +# System timezone +timezone US/Eastern --isUtc +# System bootloader configuration +bootloader --append=" crashkernel=auto" --location=mbr --boot-drive=vda +autopart --type=lvm +# Partition clearing information +clearpart --all --initlabel --drives=vda + +%packages +@apex-opendaylight +@base +@core +@virtualization-hypervisor +@virtualization-tools +chrony +kexec-tools + +%end + +%addon com_redhat_kdump --disable + +%end + +%anaconda +pwpolicy root --minlen=6 --minquality=50 --notstrict --nochanges --notempty +pwpolicy user --minlen=6 --minquality=50 --notstrict --nochanges --notempty +pwpolicy luks --minlen=6 --minquality=50 --notstrict --nochanges --notempty +%end + +#version=DEVEL +# System authorization information +auth --enableshadow --passalgo=sha512 +# Use CDROM installation media +cdrom +# Use text mode install +text +# Run the Setup Agent on first boot +firstboot --disable +ignoredisk --only-use=vda +# Keyboard layouts +keyboard --vckeymap=us --xlayouts='' +# System language +lang en_US.UTF-8 + +# Network information +network --bootproto=dhcp --device=eth0 --onboot=off --ipv6=auto --no-activate +network --hostname=localhost.localdomain + +# Root password +rootpw --iscrypted $6$l4m1GNdyJ/.EP40T$2Nn99xwbJexsqqYqbgWCUivSIqJTOTTNuxmli6TM9.3uom5eiIZDPQ3UZ6gVYi0ir2px4z7e2DnccmoV/EXNB/ +# System services +services --enabled="chronyd" @@ -2,19 +2,6 @@ # Utility script used to interact with a deployment # @author Tim Rozet (trozet@redhat.com) -# Backwards compat for old ENV Vars -# Remove in E Release -if [ -n "$CONFIG" ]; then - echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}" - echo -e "${red}WARNING: CONFIG will be removed in E${reset}" - BASE=$CONFIG -fi -if [ -n "$RESOURCES" ]; then - echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}" - echo -e "${red}WARNING: RESOURCES will be removed in E${reset}" - IMAGES=$RESOURCES -fi - BASE=${BASE:-'/var/opt/opnfv'} IMAGES=${IMAGES:-"$BASE/images"} LIB=${LIB:-"$BASE/lib"} |