From 61bdecebdc9990ad7e3f02697cbeeedfcde28461 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 30 May 2024 14:12:49 -0400 Subject: [PATCH] flutter-cluster-dashboard: fix KVM demo configurations While reviewing things to document them, I realized thath the flutter-cluster-dashboard configuration for the plain KVM demo image was incorrect, and that a separate configuration was required for the preconfigured demo image where the databroker runs on the KVM host. This fixes the existing configuration file, adds a new one, and updates the corresponding preconfigured guest image. Bug-AGL: SPEC-5138 Change-Id: Ib24d3e1e5018efffce1bc820a7fd4f26ac38ddd6 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29926 ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account --- .../images/agl-cluster-demo-flutter-guest-preconfigured.bb | 2 ++ .../files/cluster-dashboard.yaml.kvm-demo | 2 +- .../files/cluster-dashboard.yaml.kvm-demo-preconfigured | 4 ++++ .../flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb | 9 +++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo-preconfigured diff --git a/meta-agl-kvm-demo/recipes-platform/images/agl-cluster-demo-flutter-guest-preconfigured.bb b/meta-agl-kvm-demo/recipes-platform/images/agl-cluster-demo-flutter-guest-preconfigured.bb index d5c8fcec2..97ef37765 100644 --- a/meta-agl-kvm-demo/recipes-platform/images/agl-cluster-demo-flutter-guest-preconfigured.bb +++ b/meta-agl-kvm-demo/recipes-platform/images/agl-cluster-demo-flutter-guest-preconfigured.bb @@ -2,6 +2,8 @@ require agl-cluster-demo-flutter-guest.bb SUMMARY = "AGL KVM demo guest preconfigured cluster Flutter image" +FLUTTER_CLUSTER_DASHBOARD_CONF = "flutter-cluster-dashboard-conf-kvm-demo-preconfigured" + # The cluster screen is rotated in the full demo setup, so the # default compositor configuration needs to be replaced. IMAGE_INSTALL:remove = "weston-ini-conf-landscape" diff --git a/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo index 9267b4d40..17e5888e8 100644 --- a/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo +++ b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo @@ -1,4 +1,4 @@ -hostname: 172.16.10.1 +hostname: 172.16.10.2 authorization : "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token" use-tls : true tls-server-name : "localhost" diff --git a/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo-preconfigured b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo-preconfigured new file mode 100644 index 000000000..9267b4d40 --- /dev/null +++ b/recipes-demo/flutter-cluster-dashboard/files/cluster-dashboard.yaml.kvm-demo-preconfigured @@ -0,0 +1,4 @@ +hostname: 172.16.10.1 +authorization : "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token" +use-tls : true +tls-server-name : "localhost" diff --git a/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb b/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb index f3dd8f1e0..b09156bbb 100644 --- a/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb +++ b/recipes-demo/flutter-cluster-dashboard/flutter-cluster-dashboard_git.bb @@ -15,6 +15,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/flutter-instrument-clust file://cluster-dashboard.yaml.demo \ file://cluster-dashboard.yaml.gateway-demo \ file://cluster-dashboard.yaml.kvm-demo \ + file://cluster-dashboard.yaml.kvm-demo-preconfigured \ file://cluster-dashboard.token \ file://kvm.conf \ " @@ -44,6 +45,7 @@ do_install:append() { install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.demo ${D}${sysconfdir}/xdg/AGL/ install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.gateway-demo ${D}${sysconfdir}/xdg/AGL/ install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.kvm-demo ${D}${sysconfdir}/xdg/AGL/ + install -m 0644 ${WORKDIR}/cluster-dashboard.yaml.kvm-demo-preconfigured ${D}${sysconfdir}/xdg/AGL/ install -m 0644 ${WORKDIR}/cluster-dashboard.token ${D}${sysconfdir}/xdg/AGL/cluster-dashboard/ } @@ -85,3 +87,10 @@ RDEPENDS:${PN}-conf-kvm-demo = "${PN} ${PN}-conf-kvm" RPROVIDES:${PN}-conf-kvm-demo = "cluster-dashboard.yaml" ALTERNATIVE:${PN}-conf-kvm-demo = "cluster-dashboard.yaml" ALTERNATIVE_TARGET_${PN}-conf-kvm-demo = "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.kvm-demo" + +PACKAGE_BEFORE_PN += "${PN}-conf-kvm-demo-preconfigured" +FILES:${PN}-conf-kvm-demo-preconfigured += "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.kvm-demo-preconfigured" +RDEPENDS:${PN}-conf-kvm-demo-preconfigured = "${PN} ${PN}-conf-kvm" +RPROVIDES:${PN}-conf-kvm-demo-preconfigured = "cluster-dashboard.yaml" +ALTERNATIVE:${PN}-conf-kvm-demo-preconfigured = "cluster-dashboard.yaml" +ALTERNATIVE_TARGET_${PN}-conf-kvm-demo-preconfigured = "${sysconfdir}/xdg/AGL/cluster-dashboard.yaml.kvm-demo-preconfigured" -- 2.16.6