diff options
Diffstat (limited to 'deploy/adapters/ansible/roles')
| -rw-r--r-- | deploy/adapters/ansible/roles/config-osa/files/op-venv-script.sh | 9 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/files/op-venv-script.sh b/deploy/adapters/ansible/roles/config-osa/files/op-venv-script.sh index fb197555..3fcab155 100644 --- a/deploy/adapters/ansible/roles/config-osa/files/op-venv-script.sh +++ b/deploy/adapters/ansible/roles/config-osa/files/op-venv-script.sh @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + #!/usr/local/env bash set -ev diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml index 2deecb3b..0ad47d3c 100644 --- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/main.yml @@ -19,8 +19,10 @@ - include_vars: "{{ ansible_os_family }}.yml" when: + - odl_sfc is not defined or odl_sfc != "Enable" - NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight" - include: odl.yml when: + - odl_sfc is not defined or odl_sfc != "Enable" - NEUTRON_MECHANISM_DRIVERS[0] == "opendaylight" |