[CORD-1650]
Finish changeover to new network config variables
Change-Id: Idff450402e4f563a8a19cdf1ad898e23802d16c1
diff --git a/rcord.yml b/rcord.yml
index 8e42343..a94f6e5 100644
--- a/rcord.yml
+++ b/rcord.yml
@@ -93,11 +93,6 @@
# service graph gui constraints
xos_gui_service_graph_constraints: '[[null, "rcord"], [null, "volt"], ["addressmanager", "vsg"], [null, "vrouter"]]'
-# 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
-
# Juju config
charm_versions:
ceilometer-agent: "cs:trusty/ceilometer-agent-13"
diff --git a/templates/management-net.yaml.j2 b/templates/management-net.yaml.j2
index cbef35c..809e00c 100644
--- a/templates/management-net.yaml.j2
+++ b/templates/management-net.yaml.j2
@@ -49,7 +49,7 @@
properties:
name: management
# ip_version: 4
- subnet: {{ management_network_cidr }}
+ subnet: {{ vtn_net_management_local_cidr }}
permit_all_slices: true
requirements:
- template: