From a84dfcb92e1de313fea7841224be5a374a2d2184 Mon Sep 17 00:00:00 2001
From: JingLu5 <lvjing5@huawei.com>
Date: Mon, 27 Mar 2017 02:15:00 +0000
Subject: Bugfix: fix typo
Change-Id: I9b7cd5f94b1663af3b807ce24c941868b10d85d1
Signed-off-by: JingLu5 <lvjing5@huawei.com>
---
.../roles/cpu_pin_local_teardowm/tasks/main.yaml | 50 ----------------------
.../roles/cpu_pin_local_teardown/tasks/main.yaml | 50 ++++++++++++++++++++++
ansible/roles/vcpu_pin_set_setup/tasks/main.yaml | 2 +-
requirements.txt | 2 +
4 files changed, 53 insertions(+), 51 deletions(-)
delete mode 100644 ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml
create mode 100644 ansible/roles/cpu_pin_local_teardown/tasks/main.yaml
diff --git a/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml b/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml
deleted file mode 100644
index 29475421d..000000000
--- a/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-##############################################################################
-# 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/cpu_pin_local_teardown/tasks/main.yaml b/ansible/roles/cpu_pin_local_teardown/tasks/main.yaml
new file mode 100644
index 000000000..29475421d
--- /dev/null
+++ b/ansible/roles/cpu_pin_local_teardown/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/vcpu_pin_set_setup/tasks/main.yaml b/ansible/roles/vcpu_pin_set_setup/tasks/main.yaml
index 2a456ab9a..2278525eb 100644
--- a/ansible/roles/vcpu_pin_set_setup/tasks/main.yaml
+++ b/ansible/roles/vcpu_pin_set_setup/tasks/main.yaml
@@ -18,4 +18,4 @@
lineinfile:
dest: /etc/nova/nova.conf
insertafter: 'DEFAULT'
- line: 'vcpu_pin_set={{cpu_set}}
+ line: 'vcpu_pin_set={{cpu_set}}'
diff --git a/requirements.txt b/requirements.txt
index 80547f5cd..749a0a9d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+ansible==2.2.0.0
appdirs==1.4.0
Babel==2.3.4
backport-ipaddress==0.1
@@ -70,6 +71,7 @@ PyYAML==3.11
requests==2.10.0
requestsexceptions==1.1.3
scp==0.10.2
+shade==1.17.0
simplejson==3.8.2
six==1.10.0
stevedore==1.17.1
--
cgit