summaryrefslogtreecommitdiffstats
path: root/plugins/odl_sfc/roles/setup-odl-sfc/tasks
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-09-15 07:50:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-15 07:50:29 +0000
commitb241c1a733e57556a524165c68c9b3cd0f8348b8 (patch)
treef6c39007ca9beeedb38352f6e047bd91b2921902 /plugins/odl_sfc/roles/setup-odl-sfc/tasks
parent3a02fa184ae313fb4869b86c8e72141551657df2 (diff)
parentf52b7b63a2d8e4b820b3a3cea07f225aaed1de23 (diff)
Merge "Upgrade odl from carbon to nitrogen"
Diffstat (limited to 'plugins/odl_sfc/roles/setup-odl-sfc/tasks')
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml1
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml5
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml32
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml2
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml1
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml2
6 files changed, 13 insertions, 30 deletions
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml
index dc071cc7..684f314c 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-agents-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/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_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml
index 6879340e..9ca27e0a 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-hosts-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/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_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml
index 2e58e141..7b699a35 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-repos-1.yml
@@ -1,27 +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: download networking-sfc
- shell: |
- mkdir -p /opt/tmp
- pip install networking-sfc==4.0.0 -d /opt/tmp/
- cp /opt/tmp/networking* /var/www/repo/os-releases/15.1.4/ubuntu-16.04-x86_64/
- rm -rf /opt/tmp
- when:
- - odl_sfc == "Enable"
- - inventory_hostname in groups['repo_container'][0]
-
-- 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_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml
index e2dd128d..40149346 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-1.yml
@@ -8,13 +8,11 @@
- 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: install networking-sfc
pip:
name: networking-sfc
- version: "4.0.0"
virtualenv: /openstack/venvs/neutron-15.1.4
when: odl_sfc == "Enable"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml
index 613c796b..d10634fa 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-utility-1.yml
@@ -3,5 +3,4 @@
- name: Install networking-sfc for CLI
pip:
name: networking-sfc
- version: "4.0.0"
when: odl_sfc == "Enable"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
index a22e980f..09faaa27 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/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']