Change the default values for the AddressPools in {r,e}-cord
* IP subnets used to overlap with default compute node infrastructure
IPs, so move the public IPs to a different subnet
* Change the MAC address to the default generated by 'cord generate',
which has been moved to use ON.Lab OUI to avoid conflicts.
Change-Id: I817010f76575b8439cf9ccb69a28ff8630fe0cf3
diff --git a/roles/cord-profile/templates/cord-services.yaml.j2 b/roles/cord-profile/templates/cord-services.yaml.j2
index bc8a07f..bd5fcc7 100644
--- a/roles/cord-profile/templates/cord-services.yaml.j2
+++ b/roles/cord-profile/templates/cord-services.yaml.j2
@@ -96,16 +96,16 @@
addresses_vsg:
type: tosca.nodes.AddressPool
properties:
- addresses: 10.6.1.128/26
- gateway_ip: 10.6.1.129
- gateway_mac: 02:42:0a:06:01:01
+ addresses: 10.7.1.128/26
+ gateway_ip: 10.7.1.129
+ gateway_mac: a4:23:05:06:01:01
addresses_public:
type: tosca.nodes.AddressPool
properties:
- addresses: 10.6.1.192/26
- gateway_ip: 10.6.1.193
- gateway_mac: 02:42:0a:06:01:01
+ addresses: 10.7.1.192/26
+ gateway_ip: 10.7.1.193
+ gateway_mac: a4:23:05:06:01:01
label_vsg:
type: tosca.nodes.NodeLabel
diff --git a/roles/cord-profile/templates/ecord-services.yaml.j2 b/roles/cord-profile/templates/ecord-services.yaml.j2
index b24ae83..319751a 100644
--- a/roles/cord-profile/templates/ecord-services.yaml.j2
+++ b/roles/cord-profile/templates/ecord-services.yaml.j2
@@ -72,16 +72,16 @@
addresses_veg:
type: tosca.nodes.AddressPool
properties:
- addresses: 10.6.1.128/26
- gateway_ip: 10.6.1.129
- gateway_mac: 02:42:0a:06:01:01
+ addresses: 10.7.1.128/26
+ gateway_ip: 10.7.1.129
+ gateway_mac: a4:23:05:06:01:01
addresses_public:
type: tosca.nodes.AddressPool
properties:
- addresses: 10.6.1.192/26
- gateway_ip: 10.6.1.193
- gateway_mac: 02:42:0a:06:01:01
+ addresses: 10.7.1.192/26
+ gateway_ip: 10.7.1.193
+ gateway_mac: a4:23:05:06:01:01
label_veg:
type: tosca.nodes.NodeLabel