From 79f5076f32c61e8190584a8247a7b076e32382ea Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Thu, 31 Dec 2015 14:25:18 +0800 Subject: bugfix: change all vars' name with "packages" to "package" JIRA: COMPASS-232 Change-Id: I91891076799f9e914c18239cfda143b692c6d9b1 Signed-off-by: chenshuai@huawei.com --- .../ansible/roles/open-contrail/vars/Debian.yml | 20 ++++++++++---------- .../ansible/roles/open-contrail/vars/main.yml | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/vars') diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml b/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml index d920eee8..62596917 100755 --- a/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml @@ -2,10 +2,10 @@ package: "contrail-install-packages_2.21-102-ubuntu-14-04juno_all.deb" -common_packages: +common_package: - contrail-setup -kernel_packages: +kernel_package: - linux-headers-3.13.0-40 - linux-headers-3.13.0-40-generic - linux-image-3.13.0-40-generic @@ -13,28 +13,28 @@ kernel_packages: kernel_required: "3.13.0-40-generic" -database_packages: +database_package: - contrail-openstack-database -config_packages: +config_package: - contrail-openstack-config -control_packages: +control_package: - contrail-openstack-control -collector_packages: +collector_package: - contrail-openstack-analytics -webui_packages: +webui_package: - contrail-openstack-webui -vrouter_packages: +vrouter_package: - contrail-vrouter-3.13.0-40-generic -dkms_packages: +dkms_package: - contrail-vrouter-dkms -compute_packages: +compute_package: - contrail-vrouter-common - contrail-nova-vif diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml index 0f47bd77..e19b1fbf 100755 --- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml @@ -55,9 +55,9 @@ contrail_tor_agents: # adapter for compass -kernel_packages_noarch: [] +kernel_package_noarch: [] -compute_packages_noarch: [] +compute_package_noarch: [] # network infor adapter for compass contrail_device: "mgmt" -- cgit 1.2.3-korg