From f82e467c2e3b4ff3cbe4a5854f7ee36d9a516d21 Mon Sep 17 00:00:00 2001 From: Sanjay Chari Date: Wed, 8 Sep 2021 10:40:28 +0530 Subject: [PATCH] Clone e2e-benchmarking repo during browbeat installation This patch adds an option to clone the e2e-benchmarking repo during browbeat installation, so that we can use it to run shift-on-stack workloads in browbeat. Change-Id: I56f0b7e2e1e7d214cbed10b06f8c8d7a0f0f2395 --- ansible/install/browbeat.yml | 1 + ansible/install/group_vars/all.yml | 3 +++ ansible/install/group_vars/zuul_all.yml | 3 +++ ansible/install/roles/e2e-benchmarking/tasks/main.yml | 8 ++++++++ doc/source/installation.rst | 10 ++++++++++ 5 files changed, 25 insertions(+) create mode 100644 ansible/install/roles/e2e-benchmarking/tasks/main.yml diff --git a/ansible/install/browbeat.yml b/ansible/install/browbeat.yml index f13985135..2575085af 100644 --- a/ansible/install/browbeat.yml +++ b/ansible/install/browbeat.yml @@ -17,6 +17,7 @@ - { role: flavors, when: browbeat_create_flavors} - { role: images, when: browbeat_upload_guest_images} - { role: workloads, when: install_browbeat_workloads} + - { role: e2e-benchmarking, when: install_e2e_benchmarking} environment: "{{proxy_env}}" - hosts: Controller, Compute diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml index 657a44e39..a2bdf7318 100644 --- a/ansible/install/group_vars/all.yml +++ b/ansible/install/group_vars/all.yml @@ -72,6 +72,9 @@ iptables_file: /etc/sysconfig/iptables # Install Browbeat workloads install_browbeat_workloads: false +# Install e2e-benchmarking for shift-on-stack workloads +install_e2e_benchmarking: false + # Network ID which has external access browbeat_network: diff --git a/ansible/install/group_vars/zuul_all.yml b/ansible/install/group_vars/zuul_all.yml index 304394a54..390e142f4 100644 --- a/ansible/install/group_vars/zuul_all.yml +++ b/ansible/install/group_vars/zuul_all.yml @@ -55,6 +55,9 @@ iptables_file: /etc/sysconfig/iptables # Install Browbeat workloads install_browbeat_workloads: false +# Install e2e-benchmarking for shift-on-stack workloads +install_e2e_benchmarking: false + # Network ID which has external access browbeat_network: diff --git a/ansible/install/roles/e2e-benchmarking/tasks/main.yml b/ansible/install/roles/e2e-benchmarking/tasks/main.yml new file mode 100644 index 000000000..0f85faaad --- /dev/null +++ b/ansible/install/roles/e2e-benchmarking/tasks/main.yml @@ -0,0 +1,8 @@ +--- + +- name: Clone e2e-benchmarking + git: + repo: 'http://github.com/cloud-bulldozer/e2e-benchmarking.git' + dest: "{{ browbeat_path }}/ansible/gather/e2e-benchmarking" + version: master + force: yes diff --git a/doc/source/installation.rst b/doc/source/installation.rst index ec4d317ae..33230a0f5 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -55,6 +55,16 @@ On the Undercloud internet. Some useful documentation can be found at: https://access.redhat.com/documentation/en/red-hat-openstack-platform/11/single/networking-guide/ +(Optional) Clone e2e-benchmarking repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +e2e-benchmarking is a repository that is used to run workloads to stress an Openshift +cluster, and is needed to run shift-on-stack workloads in Browbeat. + +To enable the e2e-benchmarking repository to be cloned, set install_e2e_benchmarking: true +in ansible/install/group_vars/all.yml before running the command mentioned below. + + [stack@undercloud ansible]$ ansible-playbook -i hosts.yml install/browbeat.yml + (Optional) Install Browbeat instance workloads ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Browbeat instance workloads are orchestrated Rally plugins that ship with Browbeat.