diff --git a/ansible/install/browbeat_network.yml b/ansible/install/browbeat_network.yml deleted file mode 100644 index 4057fc615..000000000 --- a/ansible/install/browbeat_network.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# -# Playbook for browbeat-network -# -# Creates public and private network for use with Perfkit and Shaker -# - -- hosts: undercloud - remote_user: "{{ local_remote_user }}" - roles: - - browbeat-network diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml index d025688d6..8d96670e5 100644 --- a/ansible/install/group_vars/all.yml +++ b/ansible/install/group_vars/all.yml @@ -348,25 +348,6 @@ shaker_region: regionOne # Port for Connman connmon_port: 5800 -######################################## -# Browbeat Network Configuration -######################################## -# Public network that perfkit and shaker utilize -browbeat_pub_net_name: browbeat_public -browbeat_pub_subnet: 1.1.1.1/22 -browbeat_pub_pool_start: 1.1.1.1 -browbeat_pub_pool_end: 1.1.1.1 -browbeat_pub_pool_gw: 1.1.1.1 -# Private subnet -browbeat_pri_net_name: browbeat_private -browbeat_pri_subnet: 172.16.10.0/24 -browbeat_pri_pool_start: 172.16.10.2 -browbeat_pri_pool_end: 172.16.10.100 -browbeat_pri_pool_gw: 172.16.10.1 -browbeat_pri_pool_dns: 8.8.8.8 - -browbeat_router_name: browbeat_router - ######################################## # ELK Server Variables ######################################## diff --git a/ansible/oooq/install-browbeat.yml b/ansible/oooq/install-browbeat.yml index 4a922fc79..f0afd64b4 100644 --- a/ansible/oooq/install-browbeat.yml +++ b/ansible/oooq/install-browbeat.yml @@ -13,6 +13,6 @@ - browbeat/shaker - browbeat/flavors - browbeat/images - - browbeat/browbeat-network + - browbeat/ci-network - browbeat/template-configs - browbeat/statsd-ironic diff --git a/ansible/oooq/roles/ci-network/defaults/main.yml b/ansible/oooq/roles/ci-network/defaults/main.yml new file mode 100644 index 000000000..a388c205d --- /dev/null +++ b/ansible/oooq/roles/ci-network/defaults/main.yml @@ -0,0 +1,16 @@ +--- +# Public network that perfkit and shaker utilize +browbeat_pub_net_name: browbeat_public +browbeat_pub_subnet: 1.1.1.1/22 +browbeat_pub_pool_start: 1.1.1.1 +browbeat_pub_pool_end: 1.1.1.1 +browbeat_pub_pool_gw: 1.1.1.1 +# Private subnet +browbeat_pri_net_name: browbeat_private +browbeat_pri_subnet: 172.16.10.0/24 +browbeat_pri_pool_start: 172.16.10.2 +browbeat_pri_pool_end: 172.16.10.100 +browbeat_pri_pool_gw: 172.16.10.1 +browbeat_pri_pool_dns: 8.8.8.8 + +browbeat_router_name: browbeat_router diff --git a/ansible/install/roles/browbeat-network/tasks/main.yml b/ansible/oooq/roles/ci-network/tasks/main.yml similarity index 78% rename from ansible/install/roles/browbeat-network/tasks/main.yml rename to ansible/oooq/roles/ci-network/tasks/main.yml index fb1d5534b..0a46a2364 100644 --- a/ansible/install/roles/browbeat-network/tasks/main.yml +++ b/ansible/oooq/roles/ci-network/tasks/main.yml @@ -1,10 +1,10 @@ --- # -# Setup up network for browbeat +# Setup network using tripleo-environments params # - name: Create browbeat public network - shell: ". {{overcloudrc}}; neutron net-create {{browbeat_pub_net_name}} --shared --router:external | grep -E ' id ' | awk '{print $4}'" + shell: ". {{overcloudrc}}; neutron net-create {{browbeat_pub_net_name}} --shared --router:external --provider:network-type flat --provider:physical-network datacentre | grep -E ' id ' | awk '{print $4}'" register: public_net_id - name: Create browbeat public subnet @@ -15,7 +15,7 @@ register: private_net_id - name: Create browbeat private subnet - shell: ". {{overcloudrc}}; neutron subnet-create {{private_net_id.stdout}} {{browbeat_pri_subnet}} --allocation-pool start={{browbeat_pri_pool_start}},end={{browbeat_pri_pool_end}} --gateway={{browbeat_pri_pool_gw}} --dns-nameserver {{browbeat_pri_pool_dns}} | grep -E ' id ' | awk '{print $4}'" + shell: ". {{overcloudrc}}; neutron subnet-create {{private_net_id.stdout}} 192.168.0.0/24 | grep -E ' id ' | awk '{print $4}'" register: private_subnet_id - name: Create browbeat router diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 9548b0a85..7ce906b62 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -46,11 +46,9 @@ On the Undercloud [stack@undercloud ansible]$ sudo pip install ansible [stack@undercloud ansible]$ vi install/group_vars/all.yml # Make sure to edit the dns_server to the correct ip address [stack@undercloud ansible]$ ansible-playbook -i hosts install/browbeat.yml - [stack@undercloud ansible]$ vi install/group_vars/all.yml # Edit Browbeat network settings - [stack@undercloud ansible]$ ansible-playbook -i hosts install/browbeat_network.yml # For external access(required to build Shakerimage) [stack@undercloud ansible]$ ansible-playbook -i hosts install/shaker_build.yml -.. note:: ``browbeat-network.yml`` might not work for you depending on your +.. note:: Your default network might not work for you depending on your underlay/overlay network setup. In such cases, user needs to create appropriate networks for instances to allow them to reach the internet. Some useful documentation can be found at: @@ -121,12 +119,10 @@ From your local machine $ ./generate_tripleo_hostfile.sh -t $ vi install/group_vars/all.yml # Review and edit configuration items $ ansible-playbook -i hosts install/browbeat.yml - $ vi install/group_vars/all.yml # Edit Browbeat network settings - $ ansible-playbook -i hosts install/browbeat_network.yml # For external access(required to build Shaker image) $ ansible-playbook -i hosts install/shaker_build.yml -.. note:: ``browbeat-network.yml`` might not work for you depending on your +.. note:: Your default network might not work for you depending on your underlay/overlay network setup. In such cases, user needs to create appropriate networks for instances to allow them to reach the internet. Some useful documentation can be found at: @@ -358,15 +354,13 @@ environment is different and thus your configuration options will vary. [browbeat1@browbeatvm browbeat]$ . .browbeat-venv/bin/activate (browbeat-venv) [browbeat1@browbeatvm browbeat]$ python browbeat.py rally -11. Setup network for Shaker+PerfKitBenchmarker and build Shaker image +11. Build Shaker image :: - [browbeatuser1@browbeat-vm ~]$ vi install/group_vars/all.yml # Edit Browbeat network settings - [browbeatuser1@browbeat-vm ~]$ ansible-playbook -i hosts install/browbeat_network.yml # For external access(required to build Shaker image) [browbeatuser1@browbeat-vm ~]$ ansible-playbook -i hosts install/shaker_build.yml -.. note:: ``browbeat-network.yml`` might not work for you depending on your +.. note:: Your default network might not work for you depending on your underlay/overlay network setup. In such cases, user needs to create appropriate networks for instances to allow them to reach the internet. Some useful documentation can be found at: diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 0fdc5af4e..dafd11b1e 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -28,15 +28,11 @@ Run Browbeat performance tests from Undercloud Running PerfKitBenchmarker --------------------------- -Work is on-going to utilize PerfKitBenchmarker as a workload provider to -Browbeat. Many benchmarks work out of the box with Browbeat. You must -ensure that your network is setup correctly to run those benchmarks and -you will need to configure the settings in -ansible/install/group_vars/all.yml for Browbeat public/private -networks. Currently tested benchmarks include: aerospike, bonnie++, -cluster_boot, copy_throughput(cp,dd,scp), fio, iperf, mesh_network, -mongodb_ycsb, netperf, object_storage_service, ping, scimark2, and -sysbench_oltp. +Many benchmarks work out of the box with Browbeat. You must ensure that your +network is setup correctly to run those benchmarks. Currently tested benchmarks +include: aerospike, bonnie++, cluster_boot, copy_throughput(cp,dd,scp), fio, +iperf, mesh_network, mongodb_ycsb, netperf, object_storage_service, ping, +scimark2, and sysbench_oltp. To run Browbeat's PerfKit Benchmarks, you can start by viewing the tested benchmark's configuration in conf/browbeat-perfkit-complete.yaml. @@ -54,7 +50,7 @@ browbeat-config.yaml: :: - (browbeat-venv)[stack@ospd browbeat]$ ./browbeat.py perfkit -s browbeat-config.yaml + (browbeat-venv)[stack@ospd browbeat]$ ./browbeat.py perfkit -s browbeat-config.yaml Running Shaker --------------- @@ -66,7 +62,6 @@ convenience they are being mentioned here as well. :: - $ ansible-playbook -i hosts install/browbeat_network.yml $ ansible-playbook -i hosts install/shaker_build.yml .. note:: The playbook to setup networking is provided as an example only and