summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2015-12-31 03:53:48 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-31 03:53:48 +0000
commit4f533f22899fabca48010d053244491b055f86d9 (patch)
treeffe21555ccf1dd857a7696d918e1c10f223a1cf5
parent55baaadf3ee21bf5769ee791533b66d28f9455ef (diff)
parentee6046dce8d88f5e27c0f01b98b82ae4a1a2a865 (diff)
Merge "bugfix: change var "odl_pip_packages" to "odl_pip""
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml2
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/vars/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
index 24b69326..08881202 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
@@ -86,7 +86,7 @@
- name: install odl pip packages
pip: name={{ item }} state=present
- with_items: odl_pip_packages
+ with_items: odl_pip
#- name: restart odl service
diff --git a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
index cd4cb62f..0355c0ab 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/vars/main.yml
@@ -17,6 +17,6 @@ jdk8_pkg_name: jdk-8u51-linux-x64.tar.gz
controller_packages_noarch: []
compute_packages_noarch: []
-odl_pip_packages:
+odl_pip:
- networking_odl