dhcp-relay - CentOS Stream 9

Change the default image for the dhcp-relay instance to
CentOS-Stream-GenericCloud-9.

Since the ICS DHCP packaging changed, adds the
dhcp_relay_package parameter so that the package to install
can be configured. By default the `dhcp-relay` package which
is correct for CentOS 8 and CentOS 9 is installed. For CentOS
7 the package name must be set to `dhcp`.

Change-Id: Ib4a22071105be933c6c73ece8eca374fbc2c21d2

environments/routed-networks-configuration.yaml

@@ -19,10 +19,13 @@ parameter_defaults:
   # Type: string
   dhcp_relay_flavor: m1.small
 
-  # The base image for the dhcrelay instance.  A CentOS 7 image is currently
-  # the only one supported.
+  # The base image for the dhcrelay instance.
   # Type: string
-  dhcp_relay_image: CentOS-7-x86_64-GenericCloud
+  dhcp_relay_image: CentOS-Stream-GenericCloud-9
+
+  # Name of the RPM package providing ICS dhcrelay binary.
+  # Type: string
+  dhcp_relay_package: dhcp-relay
 
   # DHCP relay address on the provision2 network subnet
   # Type: string

sample-env-generator/environments.yaml

@@ -221,6 +221,7 @@ environments:
           - dhcp_relay_provision2_address
           - dhcp_relay_provision3_address
           - dhcp_ips
+          - dhcp_relay_package
   -
     name: routed-networks
     title: Enable Routed Networks

templates/dhcp-relay.yaml

@@ -14,10 +14,9 @@ parameters:
 
   dhcp_relay_image:
     type: string
-    default: CentOS-7-x86_64-GenericCloud
+    default: CentOS-Stream-GenericCloud-9
     description: |
-      The base image for the dhcrelay instance.  A CentOS 7 image is currently
-      the only one supported.
+      The base image for the dhcrelay instance.
 
   dhcrelay_prefix:
     type: string
@@ -54,6 +53,11 @@ parameters:
     type: json
     description: A map with provision network router data
 
+  dhcp_relay_package:
+    type: string
+    description: Name of the RPM package providing ICS dhcrelay binary.
+    default: dhcp-relay
+
 resources:
   dhcp_relay_port_private:
     type: OS::Neutron::Port
@@ -125,7 +129,7 @@ resources:
       cloud_config:
         package_upgrade: true
         packages:
-          - dhcp
+          - {get_param: dhcp_relay_package}
 
   init_files:
     type: OS::Heat::CloudConfig