CORD-1511 Use OVS instead of CPqD
Change-Id: I0cd5b729d677d879a7d57b5881b8dd4010881e60
diff --git a/cord-fabric-pingtest.yml b/cord-fabric-pingtest.yml
index 6679402..3c2fc86 100644
--- a/cord-fabric-pingtest.yml
+++ b/cord-fabric-pingtest.yml
@@ -24,9 +24,8 @@
- name: Include variables
include_vars: "{{ item }}"
with_items:
- - profile_manifests/cord_defaults.yml
- - profile_manifests/cord.yml
- - profile_manifests/example_keystone.yml
+ - "profile_manifests/{{ cord_profile }}.yml"
+ - profile_manifests/local_vars.yml
- name: Fabric ping test to gateway
hosts: compute
diff --git a/cord-refresh-fabric.yml b/cord-refresh-fabric.yml
index a74f7d8..a86717b 100644
--- a/cord-refresh-fabric.yml
+++ b/cord-refresh-fabric.yml
@@ -24,9 +24,8 @@
- name: Include variables
include_vars: "{{ item }}"
with_items:
- - profile_manifests/cord_defaults.yml
- - profile_manifests/cord.yml
- - profile_manifests/example_keystone.yml
+ - "profile_manifests/{{ cord_profile }}.yml"
+ - profile_manifests/local_vars.yml
- name: Prep fabric on head node
hosts: head
diff --git a/roles/fabric-refresh/tasks/main.yml b/roles/fabric-refresh/tasks/main.yml
index c7b5237..d46ebc6 100644
--- a/roles/fabric-refresh/tasks/main.yml
+++ b/roles/fabric-refresh/tasks/main.yml
@@ -1,4 +1,3 @@
-
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,18 +12,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+- name: Install httpie
+ pip:
+ name: httpie
+ state: present
+ become: yes
-- name: Remove old ONOS fabric configuration file
- file:
- path: "{{ service_profile_repo_dest }}/{{ xos_configuration }}/network-cfg-quickstart.json"
- state: absent
-
+# This step could be implemented more cleanly (i.e., broken into multiple
+# tasks, use "uri" module). It was done this way to mirror what is
+# in the documentation (quickstart_physical.md).
- name: Rebuild and reinstall ONOS fabric configuration
- make:
- chdir: "{{ service_profile_repo_dest }}/{{ xos_configuration }}"
- target: "{{ item }}"
+ shell: "{{ item }}"
+ args:
+ chdir: /opt/cord_profile
with_items:
- - network-cfg-quickstart.json
- - delete_fabric_config
- - fabric
- - reactivate_fabric_apps
+ - "cord generate > fabric-network-cfg.json"
+ - "http -a onos:rocks DELETE http://onos-fabric:8181/onos/v1/network/configuration/"
+ - "docker-compose -p {{ cord_profile }} exec -T xos_ui python /opt/xos/tosca/run.py xosadmin@opencord.org /opt/cord_profile/fabric-service.yaml"
+ - "http -a onos:rocks POST http://onos-fabric:8181/onos/v1/applications/org.onosproject.vrouter/active"
+ - "http -a onos:rocks POST http://onos-fabric:8181/onos/v1/applications/org.onosproject.segmentrouting/active"
+ tags:
+ - skip_ansible_lint # running a sub job