summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-06-19 19:22:11 +0800
committerYifei Xue <xueyifei@huawei.com>2017-07-10 10:42:20 +0000
commita7fed3be428eddf64f626c52ef35cf691c68e431 (patch)
tree4fe6b4cf635cd3ebf3450dd97fa0e947d47ae92c /deploy/adapters
parent4db2df5989e16b2ad1152b7851136ff4dc637252 (diff)
Upgrade ODL from boron to carbon
JIRA: - Change-Id: I031444d1094af646ae39a9c0c3fbfc30548e6ee4 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/adapters')
-rw-r--r--deploy/adapters/ansible/roles/config-osa/tasks/main.yml10
-rw-r--r--deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j212
-rw-r--r--deploy/adapters/ansible/roles/post-openstack/tasks/main.yml6
3 files changed, 28 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index aac18153..e66ea949 100644
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -51,6 +51,16 @@
src: setup-ovs.yml
dest: /opt/openstack-ansible/playbooks
+- name: copy setup-odl.yml
+ template:
+ src: setup-odl.yml.j2
+ dest: /opt/openstack-ansible/playbooks/setup-odl.yml
+
+- name: copy odl_cluster role
+ copy:
+ src: /var/ansible/run/openstack_ocata-opnfv2/roles/odl_cluster
+ dest: /etc/ansible/roles/
+
- name: copy flavor roles
copy:
src: os-flavor
diff --git a/deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2
new file mode 100644
index 00000000..18446ce5
--- /dev/null
+++ b/deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2
@@ -0,0 +1,12 @@
+---
+
+- name: run opendaylight role
+ hosts: neutron_all | galera_container | network_hosts | repo_container
+ max_fail_percentage: 20
+ user: root
+ roles:
+ - odl_cluster
+ vars:
+ - odl_l3_agent: "{{ odl_l3_agent }}"
+ tags:
+ - odl
diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
index 63df7260..8140cee7 100644
--- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
@@ -7,6 +7,12 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
+- name: setup odl
+ shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \
+ cd /opt/openstack-ansible/playbooks; \
+ openstack-ansible setup-odl.yml > /dev/null"
+ when: opendaylight is defined and opendaylight == "Enable"
+
- name: create network
shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \
cd /opt/openstack-ansible/playbooks; \