summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Lee <limingjiang@huawei.com>2017-04-13 04:03:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-13 04:03:52 +0000
commitd304708efc188f4c7d5d52c1ecc1e0adf6d0dd45 (patch)
treea2b1fe853b2e0631814cfb3586963a39b48079a6
parent2240fcc201fa9665e42e92c29e201cb62490acfa (diff)
parenta84dfcb92e1de313fea7841224be5a374a2d2184 (diff)
Merge "Bugfix: fix typo"
-rw-r--r--ansible/roles/cpu_pin_local_teardown/tasks/main.yaml (renamed from ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml)0
-rw-r--r--ansible/roles/vcpu_pin_set_setup/tasks/main.yaml2
-rw-r--r--requirements.txt2
3 files changed, 3 insertions, 1 deletions
diff --git a/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml b/ansible/roles/cpu_pin_local_teardown/tasks/main.yaml
index 29475421d..29475421d 100644
--- a/ansible/roles/cpu_pin_local_teardowm/tasks/main.yaml
+++ b/ansible/roles/cpu_pin_local_teardown/tasks/main.yaml
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