[CORD-2349] Migrating REM-CORD
Change-Id: Iae573428e3bee89026262055263f24a32dd12183
diff --git a/profile_manifests/base-cord.yml b/profile_manifests/base-cord.yml
index e277eb3..0a20773 100644
--- a/profile_manifests/base-cord.yml
+++ b/profile_manifests/base-cord.yml
@@ -29,7 +29,7 @@
use_maas: True
# XOS config
-xos_tosca_config_templates:
+xos_new_tosca_config_templates:
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index a376471..3f9d329 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -30,13 +30,11 @@
use_apt_cache: True
# XOS config
-xos_tosca_config_templates:
- - onos-global-service.yaml
- - xos-gui-extensions.yml
- - carrierethernet-global-app.yaml
-
xos_new_tosca_config_templates:
+ - onos-global-service.yaml
+ - carrierethernet-global-app.yaml
- service-graph-constraints.yaml
+ - xos-gui-extensions.yml
xos_other_templates:
diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index 55dcc41..21a2536 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -29,17 +29,15 @@
use_maas: True
# XOS config
-xos_tosca_config_templates:
+xos_new_tosca_config_templates:
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
- ecord-services.yaml
- public-net.yaml
- vee-service.yaml
- - xos-gui-extensions.yml
- carrierethernet-local-app.yaml
-
-xos_new_tosca_config_templates:
+ - xos-gui-extensions.yml
- service-graph-constraints.yaml
xos_other_templates:
@@ -257,11 +255,3 @@
- name: "vsg-1.1"
url: "https://github.com/opencord/vsg/releases/download/vms/vsg-1.1.img"
checksum: "sha256:16b0beb6778aed0f5feecb05f8d5750e6c262f98e6011e99ddadf7d46a177b6f"
-
- - name: "ceilometer-trusty-server-multi-nic"
- url: "https://github.com/opencord/platform-install/releases/download/vms/ceilometer-trusty-server-multi-nic.compressed.qcow2"
- checksum: "sha256:b77ef8d692b640568dea13df99fe1dfcb1f4bb4ac05408db9ff77399b34f754f"
-
- - name: "ceilometer-service-trusty-server-multi-nic"
- url: "https://github.com/opencord/platform-install/releases/download/vms/ceilometer-service-trusty-server-multi-nic.compressed.qcow2.20170131"
- checksum: "sha256:f0341e283f0f2cb8f70cd1a6347e0081c9c8492ef34eb6397c657ef824800d4f"
diff --git a/profile_manifests/mcord-ng40.yml b/profile_manifests/mcord-ng40.yml
index 170bd66..d473815 100644
--- a/profile_manifests/mcord-ng40.yml
+++ b/profile_manifests/mcord-ng40.yml
@@ -29,16 +29,13 @@
use_maas: True
# XOS config
-xos_tosca_config_templates:
+xos_new_tosca_config_templates:
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
- shared-net.yaml
- wan-net.yaml
- vsg-net.yaml
- - xos-gui-extensions.yml
-
-xos_new_tosca_config_templates:
- s11-net.yaml
- s1u-net.yaml
- nbi-net.yaml
@@ -47,6 +44,7 @@
- sgi-net.yaml
- flat-net.yaml
- mcord-ng40-services.yml
+ - xos-gui-extensions.yml
- service-graph-constraints.yaml
xos_other_templates:
diff --git a/profile_manifests/mcord-spirent.yml b/profile_manifests/mcord-spirent.yml
index 10c2127..00ec35a 100644
--- a/profile_manifests/mcord-spirent.yml
+++ b/profile_manifests/mcord-spirent.yml
@@ -29,7 +29,8 @@
use_maas: True
# XOS config
-xos_tosca_config_templates:
+
+xos_new_tosca_config_templates:
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
@@ -37,8 +38,6 @@
- wan-net.yaml
- vsg-net.yaml
- xos-gui-extensions.yml
-
-xos_new_tosca_config_templates:
- s11-net.yaml
- s1u-net.yaml
- nbi-net.yaml
diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
index 1c85f86..fb8fdeb 100644
--- a/profile_manifests/mcord.yml
+++ b/profile_manifests/mcord.yml
@@ -29,7 +29,7 @@
use_maas: True
# XOS config
-xos_tosca_config_templates:
+xos_new_tosca_config_templates:
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
@@ -37,8 +37,6 @@
- wan-net.yaml
- vsg-net.yaml
- xos-gui-extensions.yml
-
-xos_new_tosca_config_templates:
- s11-net.yaml
- s1u-net.yaml
- s1mme-net.yaml
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index c7b459d..cfee43c 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -29,17 +29,14 @@
use_maas: True
# XOS config
-xos_tosca_config_templates:
+xos_new_tosca_config_templates:
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
- - cord-services.yaml # should unify this with services.yaml.j2 eventually
+ - cord-services.yaml
- public-net.yaml
- - vrouter.yaml
- - xos-gui-extensions.yml
-
-xos_new_tosca_config_templates:
- service-graph-constraints.yaml
+ - xos-gui-extensions.yml
xos_other_templates:
- fabric-network-cfg.json