commit 4dedbd95c451b414f1af8e7f80ec0d821b397f23
Author: Harald Jensås <hjensas@redhat.com>
Date:   Wed Sep 23 20:54:55 2020 +0200

    Add --id support for routed network resources
    
    Append the 'id' to router resources, and also the server
    name for the dhcpv6-ralay
    
    Change-Id: Ic72bb921f5f23acf49eb2f967e242031ae87fa94

diff --git a/openstack_virtual_baremetal/deploy.py b/openstack_virtual_baremetal/deploy.py
index c1ec5ab..a5137d2 100755
--- a/openstack_virtual_baremetal/deploy.py
+++ b/openstack_virtual_baremetal/deploy.py
@@ -165,6 +165,17 @@ def _generate_id_env(args):
                     default='overcloud_storage_mgmt2')
     _add_identifier(env_data, 'overcloud_tenant_net2', args.id,
                     default='overcloud_tenant2')
+    _add_identifier(env_data, 'overcloud_internal_router', args.id,
+                    default='internal_router')
+    _add_identifier(env_data, 'overcloud_storage_router', args.id,
+                    default='storage_router')
+    _add_identifier(env_data, 'overcloud_storage_mgmt_router', args.id,
+                    default='storage_mgmt_router')
+    _add_identifier(env_data, 'overcloud_tenant_router', args.id,
+                    default='tenant_router')
+    _add_identifier(env_data, 'provision_router_name', args.id,
+                    default='provision_router')
+
     # We don't modify any resource_registry entries, and because we may be
     # writing the new env file to a different path it can break relative paths
     # in the resource_registry.
diff --git a/templates/baremetal-networks-routed.yaml b/templates/baremetal-networks-routed.yaml
index 19bb1eb..c6ead30 100644
--- a/templates/baremetal-networks-routed.yaml
+++ b/templates/baremetal-networks-routed.yaml
@@ -4,6 +4,11 @@ heat_template_version: 2014-10-16
 
 parameters:
 
+  overcloud_internal_router:
+    type: string
+    description: Name of storage router
+    default: internal_router
+
   overcloud_internal_net:
     type: string
     description: Name of internal API network
@@ -48,6 +53,11 @@ parameters:
     description: IP version for the overcloud_internal_net2 subnet
     default: 4
 
+  overcloud_storage_router:
+    type: string
+    description: Name of storage router
+    default: storage_router
+
   overcloud_storage_net:
     type: string
     description: Name of storage network
@@ -92,6 +102,11 @@ parameters:
     description: IP version for the overcloud_storage_net2 subnet
     default: 4
 
+  overcloud_storage_mgmt_router:
+    type: string
+    description: Name of storage_mgmt router
+    default: storage_mgmt_router
+
   overcloud_storage_mgmt_net:
     type: string
     description: Name of storage management network
@@ -136,6 +151,11 @@ parameters:
     description: IP version for the overcloud_storage_mgmt_net2 subnet
     default: 4
 
+  overcloud_tenant_router:
+    type: string
+    description: Name of tenant router
+    default: tenant_router
+
   overcloud_tenant_net:
     type: string
     description: Name of tenant network
@@ -184,7 +204,7 @@ resources:
   internal_router:
     type: OS::Neutron::Router
     properties:
-      name: internal-router
+      name: {get_param: overcloud_internal_router}
 
   internal_network:
     type: OS::Neutron::Net
@@ -247,7 +267,7 @@ resources:
   storage_router:
     type: OS::Neutron::Router
     properties:
-      name: storage-router
+      name: {get_param: overcloud_storage_router}
 
   storage_network:
     type: OS::Neutron::Net
@@ -310,7 +330,7 @@ resources:
   storage_mgmt_router:
     type: OS::Neutron::Router
     properties:
-      name: storage-mgmt-router
+      name: {get_param: overcloud_storage_mgmt_router}
 
   storage_mgmt_network:
     type: OS::Neutron::Net
@@ -373,7 +393,7 @@ resources:
   tenant_router:
     type: OS::Neutron::Router
     properties:
-      name: tenant-router
+      name: {get_param: overcloud_tenant_router}
 
   tenant_network:
     type: OS::Neutron::Net
diff --git a/templates/dhcpv6-relay.yaml b/templates/dhcpv6-relay.yaml
index 295d41c..9afef85 100644
--- a/templates/dhcpv6-relay.yaml
+++ b/templates/dhcpv6-relay.yaml
@@ -19,6 +19,11 @@ parameters:
       The base image for the dhcrelay instance.  A CentOS 7 image is currently
       the only one supported.
 
+  dhcrelay_prefix:
+    type: string
+    description: Prefix for the name of the dhcrelay instance
+    default: dhcrelay
+
   provision_net_cidr:
     type: string
     description: CIDR for provision network subnet
@@ -270,7 +275,7 @@ resources:
   dhcp_relay_server:
     type: OS::Nova::Server
     properties:
-      name: radvd-and-dhcrelay
+      name: {get_param: dhcrelay_prefix}
       flavor: {get_param: dhcp_relay_flavor}
       image: {get_param: dhcp_relay_image}
       key_name: {get_param: key_name}
diff --git a/templates/undercloud-networks-routed.yaml b/templates/undercloud-networks-routed.yaml
index 8047ba1..7fa7cbf 100644
--- a/templates/undercloud-networks-routed.yaml
+++ b/templates/undercloud-networks-routed.yaml
@@ -6,6 +6,11 @@ parameters:
     default: provision
     description: Name of a network that will be used for provisioning traffic
 
+  provision_router_name:
+    type: string
+    description: Name of provisioning network router
+    default: provision_router
+
   provision_net_cidr:
     type: string
     description: CIDR for provision network subnet
@@ -114,7 +119,7 @@ resources:
   provision_router:
     type: OS::OVB::ProvisionNetRouter
     properties:
-      name: provision-router
+      name: {get_param: provision_router_name}
       external_gateway_info:
         network: {get_param: external_net}