From 9e452c2bbba5f13e212e66d874e8ea3cf7a5f167 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Sat, 29 Oct 2016 05:49:22 -0400 Subject: code refactoring: opendaylight for xenianl and moon JIRA: COMPASS-500 Change-Id: I6c967572193bf20dbd9da58bcf001de2b8a8346c Signed-off-by: chenshuai@huawei.com --- .../openstack_mitaka_xenial/roles/odl_cluster/vars/Debian.yml | 6 +----- .../ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars') diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/Debian.yml index 5e2a2e72..640a264a 100755 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/Debian.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/Debian.yml @@ -8,11 +8,7 @@ ############################################################################## --- -controller_packages: -# - openjdk-7-jdk - - crudini - -compute_packages: +common_packages: - crudini service_ovs_name: openvswitch-switch diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml index ffdb85d0..e5f52b42 100755 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/vars/main.yml @@ -24,8 +24,7 @@ odl_aaa_moon: odl-aaa-moon.tar.gz jdk8_pkg_name: jdk-8u51-linux-x64.tar.gz jdk8_script_name: install_jdk8.tar -controller_packages_noarch: [] -compute_packages_noarch: [] +common_packages_noarch: [] odl_pip: - networking_odl -- cgit 1.2.3-korg