Merge pull request #131 from lsst-ts/tickets/DM-32469

tickets/DM-32469
lsst-ts · Feb 2, 2022 · 8446da6 · 8446da6
2 parents 972fdfe + 028d4d8
commit 8446da6
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/deploy/summit/.env b/deploy/summit/.env
@@ -47,24 +47,24 @@ LOVE_PRODUCER_WEBSOCKET_HOST_MTScriptQueue=love-nginx/manager/obssys/ws/subscrip
 LOVE_PRODUCER_WEBSOCKET_HOST_LOVE=love-nginx/manager/obssys/ws/subscription
 LOVE_PRODUCER_WEBSOCKET_HOST_Watcher=love-nginx/manager/obssys/ws/subscription
 
-# ESS
-LOVE_PRODUCER_WEBSOCKET_HOST_AuxTelESS01=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_ComCamESS01=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_DIMM1=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_DIMM2=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_HVAC=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_MTDomeESS01=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_MTDomeESS02=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_MTDomeESS03=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_PMD=love-nginx/manager/ess/ws/subscription
-LOVE_PRODUCER_WEBSOCKET_HOST_WeatherStation1=love-nginx/manager/ess/ws/subscription
+# EAS
+LOVE_PRODUCER_WEBSOCKET_HOST_AuxTelESS01=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_ComCamESS01=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_DIMM1=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_DIMM2=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_HVAC=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_MTDomeESS01=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_MTDomeESS02=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_MTDomeESS03=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_PMD=love-nginx/manager/eas/ws/subscription
+LOVE_PRODUCER_WEBSOCKET_HOST_WeatherStation1=love-nginx/manager/eas/ws/subscription
 
 LOVE_CSC_PRODUCER=True
 
 #
 # Vera Rubin build cycle
 #
-cycle=c0022
+cycle=c0023
 
 # LSST CONFIG
 LSST_DDS_PARTITION_PREFIX=summit

diff --git a/deploy/summit/docker-compose.yml b/deploy/summit/docker-compose.yml
@@ -42,9 +42,9 @@ x-manager-service: &manager-service
     - LOVE_CSC_PRODUCER=${LOVE_CSC_PRODUCER}
   volumes:
     - ./config:/usr/src/love/manager/config
-    - ./media:/usr/src/love/manager/media 
+    - ./media:/usr/src/love/manager/media
     - manager-static:/usr/src/love/manager/static
-    
+
 x-base-producer-env: &base-producer-environment
   LSST_DDS_PARTITION_PREFIX: ${LSST_DDS_PARTITION_PREFIX}
   PROCESS_CONNECTION_PASS: ${PROCESS_CONNECTION_PASS}
@@ -366,7 +366,7 @@ services:
     container_name: producer-weatherstation1
     environment:
       <<: *base-producer-environment
-      WEBSOCKET_HOST: ${LOVE_PRODUCER_WEBSOCKET_HOST_WeatherStation1}      
+      WEBSOCKET_HOST: ${LOVE_PRODUCER_WEBSOCKET_HOST_WeatherStation1}
       LOVE_CSC_PRODUCER: WeatherStation:1
 
   #-----LOVE COMMANDER -----------
@@ -413,7 +413,7 @@ services:
   manager_auxtel:
     container_name: love-manager-auxtel
     <<: *manager-service
-  
+
   manager_latiss:
     container_name: love-manager-latiss
     <<: *manager-service
@@ -426,23 +426,23 @@ services:
   manager_comcam:
     container_name: love-manager-comcam
     <<: *manager-service
-  
-  manager_ess:
-    container_name: love-manager-ess
+
+  manager_eas:
+    container_name: love-manager-eas
     <<: *manager-service
 
   manager_obssys:
     container_name: love-manager-obssys
     <<: *manager-service
-  
+
   manager_m1m3:
     container_name: love-manager-m1m3
     <<: *manager-service
-  
+
   manager_m2:
     <<: *manager-service
     container_name: love-manager-m2
-   
+
 
   #----- LOVE FRONTEND --------------
   frontend:

diff --git a/deploy/summit/nginx.conf b/deploy/summit/nginx.conf
@@ -52,8 +52,8 @@ server {
         proxy_redirect off;
     }
 
-    location /manager/ess {
-        proxy_pass http://manager_ess:8000;
+    location /manager/eas {
+        proxy_pass http://manager_eas:8000;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";

diff --git a/deploy/summit2/.env b/deploy/summit2/.env
@@ -62,7 +62,7 @@ LOVE_CSC_PRODUCER=True
 #
 # Vera Rubin build cycle
 #
-cycle=c0022
+cycle=c0023
 
 # LSST CONFIG
 LSST_DDS_PARTITION_PREFIX=summit