Fix conflicts

Author: timfdev

.env.example

@@ -6,4 +6,5 @@ export WEBSOCKET_BROADCASTER_URL="redis://localhost:6379"
 
 export OPENAI_API_KEY=None
 export AGENT_ENABLED=False
-export SEARCH_ENABLED=False
+export SEARCH_ENABLED=False
+# export COMPOSE_PROFILES=lso # unhash the start of this line to also start up lso container

README.md

@@ -1,5 +1,6 @@
 - name: Deploy config on a nokia node
   hosts: all
+  gather_facts: no
   vars:
    ansible_network_os: nokia.srlinux.srlinux
    ansible_connection: ansible.netcommon.httpapi

ansible/plays_and_roles/create_node.yaml

@@ -7,7 +7,7 @@ topology:
   kinds:
     srl:
       type: ixrd2
-      image: ghcr.io/nokia/srlinux
+      image: ghcr.io/nokia/srlinux:25.7.1
     # cvx:
     #   type: cumulus_cvx
     #   image: networkop/cx:4.3.0

clab/srlinux01.clab.yaml

@@ -26,7 +26,7 @@ x-netbox: &netbox
 services:
   postgres:
     container_name: postgres
-    image: "pgvector/pgvector:pg14"
+    image: "pgvector/pgvector:pg17"
     ports:
       - "5432:5432"
     environment:
@@ -35,7 +35,7 @@ services:
       POSTGRES_DB: orchestrator-core
     volumes:
       - db-data:/var/lib/postgresql/data/
-      - ./docker/postgresql/init.sql:/docker-entrypoint-initdb.d/init.sql
+      - ./docker/postgresql:/docker-entrypoint-initdb.d
     healthcheck:
       test:
         [
@@ -53,7 +53,7 @@ services:
 
   redis:
     container_name: redis
-    image: docker.io/redis:7.4.2-alpine
+    image: docker.io/redis:8-alpine
     command:
       - sh
       - -c # this is to evaluate the $REDIS_PASSWORD from the env
@@ -90,7 +90,7 @@ services:
 
   federation:
     container_name: federation
-    image: ghcr.io/apollographql/router:v1.47.0
+    image: ghcr.io/apollographql/router:v2.6.2
     ports:
       - "4000:4000"
     depends_on:
@@ -144,7 +144,7 @@ services:
 
   orchestrator-ui:
     container_name: orchestrator-ui
-    image: "ghcr.io/workfloworchestrator/example-orchestrator-ui:3.4.0" # TODO make it possible to override the tag
+    image: ${ORCH_UI_TAG:-ghcr.io/workfloworchestrator/example-orchestrator-ui:5.3.4}
     env_file:
       - ./docker/orchestrator-ui/orchestrator-ui.env
       - path: ./docker/overrides/orchestrator-ui/orchestrator-ui.env
@@ -157,7 +157,7 @@ services:
 
   orchestrator:
     container_name: orchestrator
-    image: "ghcr.io/workfloworchestrator/orchestrator-core:latest" # TODO make it possible to override the tag
+    image: ${ORCH_BACKEND_TAG:-ghcr.io/workfloworchestrator/orchestrator-core:latest}
     env_file:
       - ./docker/orchestrator/orchestrator.env
       - path: ./docker/overrides/orchestrator/orchestrator.env
@@ -202,7 +202,7 @@ services:
 
   lso:
     container_name: orchestrator-lso
-    image: orchestrator-lso
+    #image: orchestrator-lso
     profiles:
       - lso
     build:
@@ -215,8 +215,9 @@ services:
     ports:
       - "8001:8000"
     volumes:
-      - ./ansible/plays_and_roles:/app/wfo/ansible
+      - ./ansible/plays_and_roles:/app/demo/ansible/playbooks
       - ./ansible/inventory:/opt/ansible_inventory
+      - ./docker/lso/config.json:/app/config.json
 
   nginx:
     container_name: nginx

docker-compose.yml

@@ -5,7 +5,7 @@ RUN apt update && apt install curl -y
 RUN useradd --create-home --shell /bin/bash rover-user
 
 USER rover-user
-RUN curl -sSL https://rover.apollo.dev/nix/v0.23.0 | sh
+RUN curl -sSL https://rover.apollo.dev/nix/v0.35.0 | sh
 
 USER root
 RUN apt remove curl -y

docker/federation/rover.Dockerfile

@@ -1,4 +1,4 @@
-federation_version: =2.7.1
+federation_version: =2.9.3
 subgraphs:
   orchestrator:
     routing_url: http://orchestrator:8080/api/graphql

docker/federation/supergraph-config.yaml

@@ -4,11 +4,13 @@ WORKDIR /app
 
 RUN apk add --update --no-cache gcc libc-dev libffi-dev
 
-RUN pip install orchestrator-lso=="2.0.1"
+RUN pip install orchestrator-lso=="2.2.0"
 
-RUN pip install pynetbox
+RUN pip install pynetbox ansible
 
-RUN ansible-galaxy collection install nokia.srlinux -p /app/demo/ansible
+RUN mkdir -p $ANSIBLE_COLLECTIONS_PATH
+
+RUN ansible-galaxy collection install nokia.srlinux
 
 EXPOSE 8000
 ENTRYPOINT []

docker/lso/Dockerfile

@@ -0,0 +1,3 @@
+{
+  "ansible_playbooks_root_dir": "/app/ansible"
+}

docker/lso/config.json

@@ -1,8 +1,8 @@
 # Environment configuration for LSO application
 
 # Ansible configuration
-ANSIBLE_PLAYBOOKS_ROOT_DIR="/app/demo/ansible/ansible_collections"
-ANSIBLE_ROLES_PATH="/app/demo/ansible"
+ANSIBLE_PLAYBOOKS_ROOT_DIR="/app/demo/ansible/playbooks"
+ANSIBLE_COLLECTIONS_PATH="/app/demo/ansible/ansible_collections"
 ANSIBLE_HOST_KEY_CHECKING: "False"
 
 # Executor configuration
@@ -13,4 +13,3 @@ MAX_THREAD_POOL_WORKERS=10
 REQUEST_TIMEOUT_SEC=10
 
 TESTING=False
-