Skip to content

Commit

Permalink
Merge pull request #134 from ksimon1/revert-129-master
Browse files Browse the repository at this point in the history
Revert #129
  • Loading branch information
ksimon1 authored Feb 14, 2020
2 parents 9fa30cf + 30cd0b8 commit de44910
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 0 additions & 4 deletions automation/test-rhel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ if [[ $TARGET =~ rhel6.* ]]; then
workloads=("desktop" "server")
fi

if [[ $TARGET =~ rhel8.* ]]; then
sizes=("small" "medium" "large")
fi

delete_vm(){
vm_name=$1
template_path=$2
Expand Down
3 changes: 3 additions & 0 deletions generate-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
src: rhel7.tpl.yaml
dest: "{{ playbook_dir }}/dist/templates/{{ os }}-{{ item.workload }}-{{ item.flavor }}.yaml"
with_items:
- {flavor: tiny, workload: server, memsize: "1Gi", cpus: 1, iothreads: False, tablet: False}
- {flavor: tiny, workload: desktop, memsize: "1Gi", cpus: 1, iothreads: False, tablet: True}
- {flavor: tiny, workload: highperformance, memsize: "1Gi", cpus: 1, iothreads: True, tablet: False}
- {flavor: small, workload: server, memsize: "2Gi", cpus: 1, iothreads: False, tablet: False}
- {flavor: small, workload: desktop, memsize: "2Gi", cpus: 1, iothreads: False, tablet: True}
- {flavor: small, workload: highperformance, memsize: "2Gi", cpus: 1, iothreads: True, tablet: False}
Expand Down

0 comments on commit de44910

Please sign in to comment.