diff options
Diffstat (limited to 'ansible/roles')
10 files changed, 216 insertions, 0 deletions
diff --git a/ansible/roles/cpu_pin_local_setup/tasks/main.yaml b/ansible/roles/cpu_pin_local_setup/tasks/main.yaml new file mode 100644 index 000000000..c25b801be --- /dev/null +++ b/ansible/roles/cpu_pin_local_setup/tasks/main.yaml @@ -0,0 +1,63 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: get nova-compute host + shell: + source /etc/yardstick/openstack.creds; + openstack availability zone list --long | grep nova-compute | sort | awk '{print $7}'; + args: + executable: /bin/bash + register: compute_nodes + +- name: get existing flavor list + shell: + source /etc/yardstick/openstack.creds; + openstack flavor list | grep "True" | cut -f 2 -d ' '; + args: + executable: /bin/bash + register: flavors + +- name: create pinned-cpu and regular host aggregate + shell: + source /etc/yardstick/openstack.creds; + openstack aggregate create pinned-cpu; + openstack aggregate create regular; + nova aggregate-set-metadata pinned-cpu pinned=true; + nova aggregate-set-metadata regular pinned=false; + nova aggregate-add-host pinned-cpu {{ compute_nodes.stdout_lines[0] }}; + nova aggregate-add-host regular {{ compute_nodes.stdout_lines[1] }}; + args: + executable: /bin/bash + +- name: set flavor default property + shell: + source /etc/yardstick/openstack.creds; + openstack flavor set --property aggregate_instance_extra_specs:pinned=false {{item}}; + args: + executable: /bin/bash + with_items: + - '{{ flavors.stdout_lines }}' + +- name: create flavor yardstick-pinned-flavor + os_nova_flavor: + cloud: opnfv + state: present + name: yardstick-pinned-flavor + ram: 512 + vcpus: 3 + disk: 3 + +- name: set yardstick-pinned-flavor property + shell: + source /etc/yardstick/openstack.creds; + openstack flavor set --property hw:cpu_policy=dedicated yardstick-pinned-flavor; + openstack flavor set --property aggregate_instance_extra_specs:pinned=true yardstick-pinned-flavor; + args: + executable: /bin/bash diff --git a/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml b/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml new file mode 100644 index 000000000..29475421d --- /dev/null +++ b/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml @@ -0,0 +1,50 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: get nova-compute host + shell: + source /etc/yardstick/openstack.creds; + openstack availability zone list --long | grep nova-compute | sort | awk '{print $7}'; + args: + executable: /bin/bash + register: compute_nodes + +- name: delete flavor yardstick-pinned-flavor + os_nova_flavor: + cloud: opnfv + state: absent + name: yardstick-pinned-flavor + +- name: get flavor list + shell: + source /etc/yardstick/openstack.creds; + openstack flavor list | grep "True" | cut -f 2 -d ' '; + args: + executable: /bin/bash + register: flavors + +- name: unset flavor default property + shell: + source /etc/yardstick/openstack.creds; + openstack flavor unset --property aggregate_instance_extra_specs:pinned {{item}}; + args: + executable: /bin/bash + with_items: + - '{{ flavors.stdout_lines }}' + +- name: delete pinned-cpu and regular host aggregate + shell: + source /etc/yardstick/openstack.creds; + nova aggregate-remove-host pinned-cpu {{ compute_nodes.stdout_lines[0] }}; + nova aggregate-remove-host regular {{ compute_nodes.stdout_lines[1] }}; + openstack aggregate delete pinned-cpu; + openstack aggregate delete regular; + args: + executable: /bin/bash diff --git a/ansible/roles/restart_nova_compute/tasks/main.yaml b/ansible/roles/restart_nova_compute/tasks/main.yaml new file mode 100644 index 000000000..77c2d4dca --- /dev/null +++ b/ansible/roles/restart_nova_compute/tasks/main.yaml @@ -0,0 +1,14 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: restart nova compute service + service: + name: nova-compute + state: restarted diff --git a/ansible/roles/restart_nova_scheduler/tasks/main.yaml b/ansible/roles/restart_nova_scheduler/tasks/main.yaml new file mode 100644 index 000000000..543e946c3 --- /dev/null +++ b/ansible/roles/restart_nova_scheduler/tasks/main.yaml @@ -0,0 +1,14 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: restart nova scheduler service + service: + name: nova-scheduler + state: restarted diff --git a/ansible/roles/scheduler_default_filters_reset/tasks/main.yaml b/ansible/roles/scheduler_default_filters_reset/tasks/main.yaml new file mode 100644 index 000000000..21e0efcfd --- /dev/null +++ b/ansible/roles/scheduler_default_filters_reset/tasks/main.yaml @@ -0,0 +1,15 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: reset scheduler default filters + lineinfile: + dest: /etc/nova/nova.conf + state: absent + regexp: 'scheduler_default_filters' diff --git a/ansible/roles/scheduler_default_filters_setup/tasks/main.yaml b/ansible/roles/scheduler_default_filters_setup/tasks/main.yaml new file mode 100644 index 000000000..5429ca91b --- /dev/null +++ b/ansible/roles/scheduler_default_filters_setup/tasks/main.yaml @@ -0,0 +1,15 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: add scheduler_default_filters for cpu pinning + lineinfile: + dest: /etc/nova/nova.conf + insertafter: 'DEFAULT' + line: 'scheduler_default_filters={{cpu_pin_filters}}' diff --git a/ansible/roles/scheduler_default_filters_setup/vars/main.yaml b/ansible/roles/scheduler_default_filters_setup/vars/main.yaml new file mode 100644 index 000000000..47b944470 --- /dev/null +++ b/ansible/roles/scheduler_default_filters_setup/vars/main.yaml @@ -0,0 +1 @@ +cpu_pin_filters: NUMATopologyFilter,AggregateInstanceExtraSpecsFilter diff --git a/ansible/roles/vcpu_pin_set_reset/tasks/main.yaml b/ansible/roles/vcpu_pin_set_reset/tasks/main.yaml new file mode 100644 index 000000000..f862c3c8f --- /dev/null +++ b/ansible/roles/vcpu_pin_set_reset/tasks/main.yaml @@ -0,0 +1,21 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: remove vcpu pin set + lineinfile: + dest: /etc/nova/nova.conf + state: absent + regexp: 'vcpu_pin_set' + +- name: remove memory reserved for host + lineinfile: + dest: /etc/nova/nova.conf + state: absent + regexp: 'reserved_host_memory_mb' diff --git a/ansible/roles/vcpu_pin_set_setup/tasks/main.yaml b/ansible/roles/vcpu_pin_set_setup/tasks/main.yaml new file mode 100644 index 000000000..2a456ab9a --- /dev/null +++ b/ansible/roles/vcpu_pin_set_setup/tasks/main.yaml @@ -0,0 +1,21 @@ +--- +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- name: set memory reserved for host + lineinfile: + dest: /etc/nova/nova.conf + insertafter: 'DEFAULT' + line: 'reserved_host_memory_mb={{host_memory}}' + +- name: set vcpu pin set + lineinfile: + dest: /etc/nova/nova.conf + insertafter: 'DEFAULT' + line: 'vcpu_pin_set={{cpu_set}} diff --git a/ansible/roles/vcpu_pin_set_setup/vars/main.yaml b/ansible/roles/vcpu_pin_set_setup/vars/main.yaml new file mode 100644 index 000000000..e5d407b44 --- /dev/null +++ b/ansible/roles/vcpu_pin_set_setup/vars/main.yaml @@ -0,0 +1,2 @@ +cpu_set: 0,2,4,6,8,10,12,14,16 +host_memory: 512 |