RHINENG-12214 Update CPU and Memory Param names (#467)

Author: saltgen

clowdapp.yaml

@@ -28,11 +28,11 @@ objects:
         args: ["-c", "export FLASK_APP=manage.py && poetry run flask db upgrade && poetry run flask seed && poetry run gunicorn ros.api.main:app"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSRHEL}
+            memory: ${MEMORY_REQUEST_ROSRHEL}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSRHEL}
+            memory: ${MEMORY_LIMIT_ROSRHEL}
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -83,11 +83,11 @@ objects:
         args: ["-c", "python -m ros.processor.inventory_events_consumer"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSRHEL}
+            memory: ${MEMORY_REQUEST_ROSRHEL}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSRHEL}
+            memory: ${MEMORY_LIMIT_ROSRHEL}
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -134,11 +134,11 @@ objects:
         args: ["-c", "python -m ros.processor.insights_engine_consumer"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSRHEL}
+            memory: ${MEMORY_REQUEST_ROSRHEL}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSRHEL}
+            memory: ${MEMORY_LIMIT_ROSRHEL}
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -185,11 +185,11 @@ objects:
         args: ["-c", "python -m ros.processor.garbage_collector"]
         resources:
           requests:
-            cpu: ${CPU_REQUEST}
-            memory: ${MEMORY_REQUEST}
+            cpu: ${CPU_REQUEST_ROSRHEL}
+            memory: ${MEMORY_REQUEST_ROSRHEL}
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${CPU_LIMIT_ROSRHEL}
+            memory: ${MEMORY_LIMIT_ROSRHEL}
         livenessProbe:
           failureThreshold: 3
           httpGet:
@@ -308,22 +308,22 @@ parameters:
   required: true
 - description: Initial cpu request.
   displayName: CPU Request
-  name: CPU_REQUEST
+  name: CPU_REQUEST_ROSRHEL
   required: true
   value: 500m
 - description: Initial amount of memory the container will request.
   displayName: Memory Request
-  name: MEMORY_REQUEST
+  name: MEMORY_REQUEST_ROSRHEL
   required: true
   value: 1Gi
 - description: Maximum amount of memory the Django container can use.
   displayName: Memory Limit
-  name: MEMORY_LIMIT
+  name: MEMORY_LIMIT_ROSRHEL
   required: true
   value: 1Gi
 - description: Maximum amount of CPU the build container can use.
   displayName: CPU Limit
-  name: CPU_LIMIT
+  name: CPU_LIMIT_ROSRHEL
   required: true
   value: '1'
 - description: Is clowder enabled