bugfix: change all vars' name with "packages" to "package"

JIRA: COMPASS-232

Change-Id: I91891076799f9e914c18239cfda143b692c6d9b1
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

9 files changed, 15 insertions, 15 deletions

diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml
index cac370e4..ba6ccbc8 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml
@@ -13,4 +13,4 @@
 #   apt:
 #   name: "contrail-openstack-analytics"
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: collector_packages
+  with_items: collector_package
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml
index 3703522d..d7f5c38b 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml
@@ -19,7 +19,7 @@
 #      when: ansible_kernel == "3.13.0-40-generic"
 #  sudo: True
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: vrouter_packages
+  with_items: vrouter_package
   when: ansible_kernel == kernel_required
 
 - name: "install contrail vrouter dkms package"
@@ -28,7 +28,7 @@
 #      when: ansible_kernel != "3.13.0-40-generic"
 #  sudo: True
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: dkms_packages
+  with_items: dkms_package
   when: ansible_kernel != kernel_required
 
 #    - name: "install contrail vrouter common package"
@@ -42,6 +42,6 @@
 - name: "install contrail vrouter common & nova vif package"
 #  sudo: True
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: compute_packages | union(compute_packages_noarch)
+  with_items: compute_package | union(compute_package_noarch)
 
 
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml
index e8d4f040..dbd542be 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml
@@ -21,4 +21,4 @@
 #      apt:
 #        name: "contrail-openstack-config"
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: config_packages
+  with_items: config_package
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml
index a1f53076..51a713ec 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml
@@ -21,4 +21,4 @@
 #      apt:
 #        name: "contrail-openstack-control"
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: control_packages
+  with_items: control_package
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml
index 364fc8e3..5b4875a7 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml
@@ -14,4 +14,4 @@
 #      apt:
 #        name: "contrail-openstack-database"
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: database_packages 
+  with_items: database_package 
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml
index f1ccfede..ed638b6a 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml
@@ -12,7 +12,7 @@
 #        name: "linux-image-extra-3.13.0-40-generic"
 #      when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic")
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: kernel_packages | union(kernel_packages_noarch)
+  with_items: kernel_package | union(kernel_package_noarch)
   when: (kernel_install) and (ansible_kernel != kernel_required)
 
 - name: "setup grub"
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml
index 727c4947..665f2be2 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml
@@ -15,4 +15,4 @@
 #      apt:
 #        name: "contrail-openstack-webui"
   action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: webui_packages
+  with_items: webui_package
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml
index 04a1c993..b20491b5 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml
@@ -53,7 +53,7 @@
 #  sudo: True
   set_fact:
 #    dbseeds: "{{ hostvars[item.1][ contrail_address ] }}"
-     dbseeds: "{{ haproxy_hosts[item] }}"
+     dbseeds: "{{ haproxy_hosts[item.1] }}"
   with_indexed_items: groups['opencontrail_database']
   when: item.0 == 0
 
@@ -65,7 +65,7 @@
 #  sudo: True
   set_fact:
 #    dbseeds: "{{ dbseeds }},{{ hostvars[item.1]['contrail_address'] }}"
-    dbseeds: "{{ dbseeds }},{{ haproxy_hosts[item] }}"
+    dbseeds: "{{ dbseeds }},{{ haproxy_hosts[item.1] }}"
   with_indexed_items: groups['opencontrail_database']
   when: item.0 == 1
 
@@ -121,7 +121,7 @@
     dest: "/etc/zookeeper/conf/zoo.cfg"
     regexp: "server.{{ item.0 + 1 }}="
 #    line: "server.{{ item.0 + 1 }}={{ hostvars[item.1]['contrail_address'] }}:2888:3888"
-    line: "server.{{ item.0 + 1 }}={{ haproxy_hosts[item] }}:2888:3888"
+    line: "server.{{ item.0 + 1 }}={{ haproxy_hosts[item.1] }}:2888:3888"
   with_indexed_items: groups['opencontrail_database']
 
 
@@ -145,7 +145,7 @@
 #  sudo: True
   set_fact:
 #    zkaddrs: "{{ hostvars[item.1]['contrail_address'] }}:2181"
-    zkaddrs: "{{ haproxy_hosts[item] }}:2181"
+    zkaddrs: "{{ haproxy_hosts[item.1] }}:2181"
   with_indexed_items: groups['opencontrail_database']
   when: item.0 == 0
 
@@ -154,7 +154,7 @@
 #  sudo: True
   set_fact:
 #    zkaddrs: "{{ zkaddrs }},{{ hostvars[item.1]['contrail_address'] }}:2181"
-    zkaddrs: "{{ zkaddrs }},{{ haproxy_hosts[item] }}:2181"
+    zkaddrs: "{{ zkaddrs }},{{ haproxy_hosts[item.1] }}:2181"
   with_indexed_items: groups['opencontrail_database']
   when: item.0 > 0
 
diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml
index 058be18a..33ad6507 100755
--- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml
+++ b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml
@@ -39,7 +39,7 @@
 
 - name: "fix up contrail vrouter agent config"
   template:
-    src: "provision/contrail-vrouter-agent-conf.j2"
+    src: "../../templates/provision/contrail-vrouter-agent-conf.j2"
     dest: "/etc/contrail/contrail-vrouter-agent.conf"
 
 - name: "delete lines for contrail interface"