Updating ecord services and global profile
Change-Id: I450f751bdf4a4caf92bd0dce63e5eeab564c98a6
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index 521cb30..ff934ae 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -14,12 +14,17 @@
xos_users: []
-use_vtn: False
+use_vtn: True
xos_tosca_config_templates:
- openstack.yaml
+ - vtn-service.yaml
+ - fabric-service.yaml
- vnodglobal-service.yaml
+xos_other_templates:
+ - fabric-network-cfg.json
+
cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
xos_docker_volumes:
@@ -45,6 +50,8 @@
path: onos-apps/apps/vtn
- name: openstack
path: orchestration/xos_services/openstack
+ - name: fabric
+ path: orchestration/xos_services/fabric
- name: onos
path: orchestration/xos_services/onos-service
- name: metronetwork
@@ -97,6 +104,11 @@
name_on_public_interface: head
+# VTN network configuration
+management_network_cidr: 172.27.0.0/24
+management_network_ip: 172.27.0.1/24
+data_plane_ip: 10.168.0.253/24
+
# CORD ONOS app version
cord_app_version: 1.2-SNAPSHOT
diff --git a/roles/cord-profile/templates/ecord-services.yaml.j2 b/roles/cord-profile/templates/ecord-services.yaml.j2
index dc6a71f..5079f69 100644
--- a/roles/cord-profile/templates/ecord-services.yaml.j2
+++ b/roles/cord-profile/templates/ecord-services.yaml.j2
@@ -78,11 +78,11 @@
view_url: /admin/vEG/vegservice/$id$/
backend_network_label: hpc_client
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
- private_key_fn: /opt/xos/services/veg/keys/veg_rsa
+ private_key_fn: /opt/cord_profile/key_import/veg_rsa
# node_label: label_veg
replaces: service_veg
artifacts:
- pubkey: /opt/xos/services/veg/keys/veg_rsa.pub
+ pubkey: /opt/cord_profile/key_import/veg_rsa.pub
service#vrouter:
type: tosca.nodes.VRouterService