From 59b0e20b6c1f7f80ce7dcacfa8fb5e1687eefeea Mon Sep 17 00:00:00 2001 From: chenshuai Date: Mon, 31 Oct 2016 03:17:44 -0400 Subject: code refactoring: opendaylight JIRA: COMPASS-500 Change-Id: I205f1fb1f31219517f6e2408fa43c8679a1cc0a6 Signed-off-by: chenshuai Signed-off-by: chenshuai@huawei.com --- .../openstack_newton_xenial/roles/odl_cluster/vars/Debian.yml | 6 +----- .../ansible/openstack_newton_xenial/roles/odl_cluster/vars/main.yml | 6 ++++-- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/vars') diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/vars/Debian.yml index 5e2a2e72..640a264a 100755 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/vars/Debian.yml +++ b/deploy/adapters/ansible/openstack_newton_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_newton_xenial/roles/odl_cluster/vars/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/vars/main.yml index da0c9efd..e5f52b42 100755 --- a/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/vars/main.yml +++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/odl_cluster/vars/main.yml @@ -19,10 +19,12 @@ odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'ma odl_extra_features: ['odl-restconf-all','odl-mdsal-clustering','odl-openflowplugin-flow-services','http','jolokia-osgi'] odl_features: "{{ odl_base_features + odl_extra_features }}" +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