Changes to support use of lightspeed-stack

Author: manstis

roles/chatbot/tasks/deploy_chatbot_api.yml

@@ -7,6 +7,7 @@
   loop:
     - 'chatbot.pvc'
     - 'chatbot.service'
+    - 'chatbot.configmap'
     - 'chatbot.deployment'
 
 - name: Check for Chatbot Pod

roles/chatbot/tasks/main.yml

@@ -17,9 +17,6 @@
   - name: Deploy AnsibleAIConnect's Chatbot service
     ansible.builtin.include_tasks: deploy_chatbot_api.yml
 
-  - name: Register MCP servers
-    ansible.builtin.include_tasks: register_mcp_servers.yml
-
   when:
     - chatbot_config_secret_name is defined
     - chatbot_config_secret_name | length

roles/chatbot/tasks/register_mcp_servers.yml

@@ -1,4 +1,12 @@
 ---
+- name: Remove Chatbot ConfigMap resources
+  kubernetes.core.k8s:
+    state: absent
+    kind: ConfigMap
+    name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-lightspeed-stack-config'
+    namespace: '{{ ansible_operator_meta.namespace }}'
+    wait: yes
+
 - name: Remove Chatbot Service resources
   kubernetes.core.k8s:
     state: absent
@@ -14,3 +22,10 @@
     name: '{{ ansible_operator_meta.name }}-chatbot-api'
     namespace: '{{ ansible_operator_meta.namespace }}'
     wait: yes
+
+- name: Remove Chatbot PVC
+  kubernetes.core.k8s:
+    state: absent
+    kind: PersistentVolumeClaim
+    name: "{{ ansible_operator_meta.name }}-chatbot-pvc"
+    namespace: "{{ ansible_operator_meta.namespace }}"

roles/chatbot/tasks/remove_chatbot_api.yml

@@ -0,0 +1,39 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-lightspeed-stack-config'
+  namespace: '{{ ansible_operator_meta.namespace }}'
+  labels:
+    {{ lookup("template", "../common/templates/labels/common.yaml.j2") | indent(width=4) | trim }}
+  annotations:
+    checksum-secret-chatbot_config: "{{ lookup('ansible.builtin.vars', 'chatbot_config', default='')["resources"][0]["data"] | default('') | sha1 }}"
+data:
+  lightspeed-stack.yaml: |
+    name: Ansible Lightspeed Intelligent Assistant
+    service:
+      host: 0.0.0.0
+      port: 8080
+      auth_enabled: false
+      workers: 1
+      color_log: true
+      access_log: true
+    llama_stack:
+      use_as_library_client: true
+      library_client_config_path: /.llama/distributions/ansible-chatbot/ansible-chatbot-run.yaml
+    user_data_collection:
+      feedback_disabled: true
+      transcripts_disabled: true
+{% if _aap_gateway_url is defined or _aap_controller_url is defined %}
+    mcp_servers:
+{% if _aap_gateway_url is defined and _aap_controller_url is defined %}
+      - name: mcp::aap-controller
+        provider_id: model-context-protocol
+        url: http://127.0.0.1:8004/sse
+{% endif %}
+{% if _aap_gateway_url is defined %}
+      - name: mcp::aap-lightspeed
+        provider_id: model-context-protocol
+        url: http://127.0.0.1:8005/sse
+{% endif %}
+{% endif %}

roles/chatbot/templates/chatbot.configmap.yaml.j2

@@ -34,6 +34,7 @@ spec:
         app.kubernetes.io/component: '{{ deployment_type }}-chatbot-api'
       annotations:
         kubectl.kubernetes.io/default-container: 'ansible-chatbot'
+        checksum-chatbot.configmap: "{{ lookup('template', 'chatbot.configmap.yaml.j2') | sha1 }}"
         checksum-secret-chatbot_config: "{{ lookup('ansible.builtin.vars', 'chatbot_config', default='')["resources"][0]["data"] | default('') | sha1 }}"
     spec:
       serviceAccountName: '{{ ansible_operator_meta.name }}'
@@ -105,6 +106,9 @@ spec:
         ports:
           - containerPort: 8321
         volumeMounts:
+          - name: lightspeed-stack-config
+            mountPath: /.llama/data/lightspeed-stack.yaml
+            subPath: lightspeed-stack.yaml
           - name: ansible-chatbot-storage
             mountPath: /.llama/data
 {% if is_openshift %}
@@ -268,6 +272,9 @@ spec:
         - name: ansible-chatbot-storage
           persistentVolumeClaim:
             claimName: "{{ ansible_operator_meta.name }}-chatbot-pvc"
+        - name: lightspeed-stack-config
+          configMap:
+            name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-lightspeed-stack-config'
 {% if is_openshift %}
         - name: server-tls-certs
           configMap:

roles/chatbot/templates/chatbot.deployment.yaml.j2

@@ -23,7 +23,12 @@ stringData:
 {% endif %}
         model_id: '{{ chatbot_model }}'
         enable_health_check: 'True'
-      provider: 'llama-stack'
+        mcp_servers:
+          - name: 'mcp::aap-controller'
+            type: 'controller'
+          - name: 'mcp::aap-lightspeed'
+            type: 'lightspeed'
+      provider: 'http'
     ModelPipelineStreamingChatBot:
       config:
 {% if not is_openshift %}
@@ -34,7 +39,12 @@ stringData:
 {% endif %}
         model_id: '{{ chatbot_model }}'
         enable_health_check: 'True'
-      provider: 'llama-stack'
+        mcp_servers:
+          - name: 'mcp::aap-controller'
+            type: 'controller'
+          - name: 'mcp::aap-lightspeed'
+            type: 'lightspeed'
+      provider: 'http'
 {% endif %}
 {% if model_config is defined %}
     ModelPipelineCompletions: