Use ONL 2.x and OFDPA 3.0 EA0 for fabric switches
Change-Id: Ic58d626687977250235ad92a37da2b0afa38b903
diff --git a/roles/fabric-switch/tasks/main.yml b/roles/fabric-switch/tasks/main.yml
index afea0ed..e55aa6b 100644
--- a/roles/fabric-switch/tasks/main.yml
+++ b/roles/fabric-switch/tasks/main.yml
@@ -20,9 +20,10 @@
changed_when: false
when: ofdpa_exists.stdout != "0"
-- name: Version I.12.1.1+1.1 Openflow Agent
+# Note: This is the version number of OFDPA 3.0 EA0
+- name: Version 2.0.4.0 Openflow Agent
include: ofdpa.yml
- when: ofdpa_exists.stdout == "0" or ofdpa_version.stdout.find('version I.12.1.1+1.1') == -1
+ when: ofdpa_exists.stdout == "0" or ofdpa_version.stdout.find('version 2.0.4.0') == -1
- name: Utilities Scripts
template:
@@ -38,15 +39,6 @@
- reset
register: utils
-- name: Mark Utilities Persistent
- command: persist {{ item }}
- with_items:
- - purge
- - killit
- - connect
- - reset
- when: utils.changed
-
- name: Authorize SSH Key
become: yes
authorized_key:
@@ -55,11 +47,3 @@
state=present
register: sshkey
-- name: Mark SSH Key Persistent
- command: persist /root/.ssh/authorized_keys
- when: sshkey.changed
-
-- name: Persist
- command: savepersist
- when: utils.changed or sshkey.changed
- failed_when: false
diff --git a/roles/fabric-switch/tasks/ofdpa.yml b/roles/fabric-switch/tasks/ofdpa.yml
index c1c0b37..efb1fb4 100644
--- a/roles/fabric-switch/tasks/ofdpa.yml
+++ b/roles/fabric-switch/tasks/ofdpa.yml
@@ -1,9 +1,9 @@
---
- name: Openflow Agent Debian Archive
get_url:
- url: http://github.com/ciena/ZeroTouchProvisioning/raw/master/ofdpa-i.12.1.1_12.1.1%2Baccton1.7-1_amd64.deb
+ url: https://github.com/onfsdn/atrium-docs/raw/master/16A/ONOS/builds/ofdpa-3.0-ea0_3.0.0.0%2Baccton1.0-1_amd64.deb
validate_certs: false
- dest: /mnt/flash2/ofdpa-i.12.1.1_12.1.1%2Baccton1.7-1_amd64.deb
+ dest: /mnt/onl/data/ofdpa-3.0-ea0_3.0.0.0+accton1.0-1_amd64.deb
- name: Verify Service Exists
stat:
@@ -30,18 +30,10 @@
failed_when: false
- name: Openflow Agent
- apt: deb="/mnt/flash2/ofdpa-i.12.1.1_12.1.1%2Baccton1.7-1_amd64.deb" force=true
+ apt: deb="/mnt/onl/data/ofdpa-3.0-ea0_3.0.0.0+accton1.0-1_amd64.deb" force=true
when: not lsb_stat.stat.exists or dist.stdout == "0"
- name: OpenFlow Agent Started
service: name=ofdpa state=started
when: not lsb_stat.stat.exists or dist.stdout == "0"
-- name: Mark Persist Openflow Agent
- command: persist /etc/accton/ofdpa.conf
- changed_when: true
-
-- name: Persist Openflow Agent
- command: savepersist
- failed_when: false
- changed_when: true
diff --git a/roles/fabric-switch/templates/purge b/roles/fabric-switch/templates/purge
index 296a8cf..720dcb4 100755
--- a/roles/fabric-switch/templates/purge
+++ b/roles/fabric-switch/templates/purge
@@ -1,3 +1,3 @@
#!/bin/bash
-/usr/bin/ofdpa-i.12.1.1/examples/client_cfg_purge
+/usr/bin/client_cfg_purge
diff --git a/roles/maas/vars/main.yml b/roles/maas/vars/main.yml
index 59bee09..c8b79ed 100644
--- a/roles/maas/vars/main.yml
+++ b/roles/maas/vars/main.yml
@@ -1,5 +1,5 @@
-accton_as5712_54x: 'https://www.dropbox.com/s/tgpsmblubr6r0xc/onie-installer-x86_64-accton_as6712_32x-r0'
-accton_as6712_32x: 'https://www.dropbox.com/s/tgpsmblubr6r0xc/onie-installer-x86_64-accton_as6712_32x-r0'
+accton_as5712_54x: 'https://www.dropbox.com/s/pl3cvr9olnaufw5/ONL-2.0.0_ONL-OS_2017-01-04.0024-8d23df5_AMD64_INSTALLED_INSTALLER'
+accton_as6712_32x: 'https://www.dropbox.com/s/pl3cvr9olnaufw5/ONL-2.0.0_ONL-OS_2017-01-04.0024-8d23df5_AMD64_INSTALLED_INSTALLER'
virtualbox:
# CHANGE: