bring over recent changes from cord-pod profile
Change-Id: Id0f74f918309088f5100f699a4ef0be76eaeef0c
diff --git a/cord-pod-ansible/base-config-2x2 b/cord-pod-ansible/base-config-2x2
deleted file mode 100644
index bc6c95b..0000000
--- a/cord-pod-ansible/base-config-2x2
+++ /dev/null
@@ -1,139 +0,0 @@
-{
- "ports" : {
- "of:0000cc37ab6180ca/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.6.1.254/24" ]
- }
- ]
- },
- "of:0000cc37ab6182d2/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.6.2.254/24" ]
- }
- ]
- },
- "of:0000cc37ab6182d2/32" : {
- "interfaces" : [
- {
- "name" : "internet-router",
- "ips" : [ "10.231.254.202/30" ],
- "mac" : "00:16:3e:4b:5a:04"
- }
- ],
- "pimInterface" : {
- "interfaceName" : "internet-router",
- "enabled" : true,
- "helloInterval" : 1,
- "holdTime" : 3,
- "propagationDelay" : 500,
- "overrideInterval" : 2500
- }
- }
- },
- "devices" : {
- "of:0000cc37ab6180ca" : {
- "segmentrouting" : {
- "name" : "Leaf-R1",
- "nodeSid" : 101,
- "routerIp" : "10.6.0.8",
- "routerMac" : "00:00:00:00:01:80",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- }
- },
- "of:0000cc37ab6182d2" : {
- "segmentrouting" : {
- "name" : "Leaf-R2",
- "nodeSid" : 102,
- "routerIp" : "10.6.0.11",
- "routerMac" : "00:00:00:00:02:80",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- }
- },
- "of:0000cc37ab618048" : {
- "segmentrouting" : {
- "name" : "Spine-R1",
- "nodeSid" : 103,
- "routerIp" : "10.6.0.18",
- "routerMac" : "00:00:01:00:11:80",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- }
- },
- "of:0000cc37ab617ec2" : {
- "segmentrouting" : {
- "name" : "Spine-R2",
- "nodeSid" : 104,
- "routerIp" : "10.6.0.17",
- "routerMac" : "00:00:01:00:22:80",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- }
- }
- },
- "links" : {
- "of:0000cc37ab6180ca/1-of:0000cc37ab618048/1" : {
- "basic" : {}
- },
- "of:0000cc37ab6180ca/3-of:0000cc37ab617ec2/1" : {
- "basic" : {}
- },
- "of:0000cc37ab6182d2/1-of:0000cc37ab618048/3" : {
- "basic" : {}
- },
- "of:0000cc37ab6182d2/3-of:0000cc37ab617ec2/3" : {
- "basic" : {}
- },
- "of:0000cc37ab618048/1-of:0000cc37ab6180ca/1" : {
- "basic" : {}
- },
- "of:0000cc37ab617ec2/1-of:0000cc37ab6180ca/3" : {
- "basic" : {}
- },
- "of:0000cc37ab618048/3-of:0000cc37ab6182d2/1" : {
- "basic" : {}
- },
- "of:0000cc37ab617ec2/3-of:0000cc37ab6182d2/3" : {
- "basic" : {}
- }
- },
- "apps" : {
- "org.onosproject.core" : {
- "core" : {
- "linkDiscoveryMode" : "STRICT"
- },
- "multicast": {
- "ingressVlan": "None",
- "egressVlan": "None"
- }
- },
- "org.onosproject.segmentrouting" : {
- "segmentrouting" : {
- "vRouterMacs" : [
- "a4:23:05:34:56:78", "a4:23:05:34:56:79"
- ],
- "vRouterId" : "of:0000cc37ab6182d2",
- "suppressSubnet" : [
- "of:0000cc37ab6182d2/31", "of:0000cc37ab6182d2/32"
- ],
- "suppressHostByProvider" : [
- "org.onosproject.provider.host"
- ],
- "suppressHostByPort" : [
- "of:0000cc37ab6182d2/31", "of:0000cc37ab6182d2/32"
- ]
- }
- },
- "org.onosproject.router" : {
- "router" : {
- "controlPlaneConnectPoint" : "of:0000cc37ab6182d2/31",
- "ospfEnabled" : "true",
- "pimEnabled" : "true",
- "interfaces" : [ "internet-router" ]
- }
- }
- }
-}
diff --git a/cord-pod-ansible/roles/buildconfig/tasks/main.yml b/cord-pod-ansible/roles/buildconfig/tasks/main.yml
index 26907d3..338dd4b 100644
--- a/cord-pod-ansible/roles/buildconfig/tasks/main.yml
+++ b/cord-pod-ansible/roles/buildconfig/tasks/main.yml
@@ -9,5 +9,8 @@
- name: make vtn-external.yaml
shell: export SETUPDIR={{ setup_dir }}; bash {{ config_dir }}/scripts/make-vtn-external-yaml.sh
+- name: copy network-cfg-quickstart.json from fabric service repo
+ copy: src="{{ xos_services_dir }}/fabric/config/network-cfg-quickstart.json" dest="{{ setup_dir }}"
+
- name: make fabric.yaml
shell: export SETUPDIR={{ setup_dir }}; bash {{ config_dir }}/scripts/make-fabric-yaml.sh
diff --git a/cord-pod-ansible/scripts/make-fabric-yaml.sh b/cord-pod-ansible/scripts/make-fabric-yaml.sh
index 7c4cfd7..b52ba82 100644
--- a/cord-pod-ansible/scripts/make-fabric-yaml.sh
+++ b/cord-pod-ansible/scripts/make-fabric-yaml.sh
@@ -24,7 +24,7 @@
replaces: service_ONOS_Fabric
rest_onos/v1/network/configuration/: { get_artifact: [ SELF, fabric_network_cfg_json, LOCAL_FILE ] }
artifacts:
- fabric_network_cfg_json: /root/setup/base-config-2x2
+ fabric_network_cfg_json: /root/setup/network-cfg-quickstart.json
service#fabric:
type: tosca.nodes.FabricService