diff options
| author |   Justin chi <chigang@huawei.com> | 2017-09-15 07:50:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-15 07:50:29 +0000 |
| commit | b241c1a733e57556a524165c68c9b3cd0f8348b8 (patch) | |
| tree | f6c39007ca9beeedb38352f6e047bd91b2921902 /plugins/odl_cluster/roles/setup-odl/tasks | |
| parent | 3a02fa184ae313fb4869b86c8e72141551657df2 (diff) | |
| parent | f52b7b63a2d8e4b820b3a3cea07f225aaed1de23 (diff) | |
Merge "Upgrade odl from carbon to nitrogen"
Diffstat (limited to 'plugins/odl_cluster/roles/setup-odl/tasks')
5 files changed, 13 insertions, 18 deletions
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml index dc071cc7..684f314c 100755 --- a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml +++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml @@ -8,7 +8,6 @@ - name: install networking-odl pip: name: networking-odl - version: "{{ networking_odl_version }}" virtualenv: /openstack/venvs/neutron-15.1.4 - name: configure vsctl for dhcp agent diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-hosts-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-hosts-1.yml index 6879340e..9ca27e0a 100755 --- a/plugins/odl_cluster/roles/setup-odl/tasks/control-hosts-1.yml +++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-hosts-1.yml @@ -94,6 +94,11 @@ sed -i 's/port="8282"/port="8081"/' {{ odl_home }}configuration/tomcat-server.xml +- name: modify 8181 to 8081 + shell: > + sed -i 's/8181/8081/' + {{ odl_home }}etc/org.ops4j.pax.web.cfg + - name: remove karaf data directory file: path: "{{ odl_home }}data" diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml index 8427e4f0..7b699a35 100755 --- a/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml +++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml @@ -1,17 +1,9 @@ --- +- name: copy download script + copy: + src: odl_pkg.sh + dest: /opt/odl_pkg.sh + mode: 0777 -- name: download networking-odl - get_url: - url: "{{ odl_pip }}" - dest: /var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64 - -- name: patch networking-odl to fix a bug - shell: | - cd /var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/ - tar -zxf networking-odl-4.0.0.tar.gz # hard code, need to modify - rm -rf networking-odl-4.0.0.tar.gz - sed -i 's/^Babel.*/Babel!=2.4.0,>=2.3.4/' networking-odl-4.0.0/requirements.txt - tar -zcf networking-odl-4.0.0.tar.gz networking-odl-4.0.0/ - rm -rf networking-odl-4.0.0/ - pip install networking-odl-4.0.0.tar.gz -d ./ - cd - +- name: download networking sfc and odl + command: su -s /bin/sh -c "/opt/odl_pkg.sh" diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml index 459c734a..f6f73684 100755 --- a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml +++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml @@ -8,7 +8,6 @@ - name: install networking-odl pip: name: networking-odl - version: "{{ networking_odl_version }}" virtualenv: /openstack/venvs/neutron-15.1.4 # Todo: hardcode, need to modify - name: turn off neutron-server on control node diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml b/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml index 5b57fb00..8cd12da8 100755 --- a/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml +++ b/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml @@ -15,7 +15,7 @@ - include: control-repos-1.yml vars: odl_pip: "{{ networking_odl_url }}" - when: inventory_hostname in groups['repo_container'] + when: inventory_hostname == groups['repo_container'][0] - include: control-servers-1.yml when: inventory_hostname in groups['neutron_server'] |