From bf63fd79ca2d391ac873b6dfd1095e7732c88e08 Mon Sep 17 00:00:00 2001 From: jovial Date: Tue, 18 Jan 2022 13:01:55 +0000 Subject: [PATCH 1/4] Switch to downstream fork of cloudkitty This brings in a few additional features not in the regular wallaby release. --- etc/kayobe/kolla.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 1f0ac3bc8..d221cdd64 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -181,6 +181,13 @@ kolla_build_blocks: -e '/#baseurl.*/a baseurl={{ repo.url }}' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \ {% endfor %} + cloudkitty_base_footer: | + # Backport of NOTNUMBOOL: https://review.opendev.org/c/openstack/cloudkitty/+/774084 + # Support customising Prometheus queries: https://review.opendev.org/c/openstack/cloudkitty/+/817275 + RUN pip install git+https://github.com/stackhpc/cloudkitty.git@stackhpc/wallaby + horizon_footer: | + # Fixes CloudKitty pricing panel: https://github.com/stackhpc/cloudkitty-dashboard/pull/1 + RUN pip install git+https://github.com/stackhpc/cloudkitty-dashboard.git@stackhpc/wallaby grafana_plugins_install: | RUN grafana-cli plugins install vonage-status-panel ironic_inspector_header: | From 35f5101bfe017791ed18ad8d3a26b1680afb3a56 Mon Sep 17 00:00:00 2001 From: jovial Date: Tue, 18 Jan 2022 13:18:30 +0000 Subject: [PATCH 2/4] Use kolla_sources instead of build blocks footer --- etc/kayobe/kolla.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index d221cdd64..185991f0f 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -104,6 +104,17 @@ kolla_sources: type: git location: "{{ kolla_bifrost_source_url }}" reference: "{{ kolla_bifrost_source_version }}" + cloudkitty-base: + # Backport of NOTNUMBOOL: https://review.opendev.org/c/openstack/cloudkitty/+/774084 + # Support customising Prometheus queries: https://review.opendev.org/c/openstack/cloudkitty/+/817275 + type: git + location: https://github.com/stackhpc/cloudkitty.git + reference: stackhpc/wallaby + horizon-plugin-cloudkitty-dashboard: + # Fixes CloudKitty pricing panel: https://github.com/stackhpc/cloudkitty-dashboard/pull/1 + type: git + location: https://github.com/stackhpc/cloudkitty-dashboard.git + reference: stackhpc/wallaby ironic-inspector-additions-stackhpc-inspector-plugins: # Install our custom inspector plugins. type: git @@ -181,13 +192,6 @@ kolla_build_blocks: -e '/#baseurl.*/a baseurl={{ repo.url }}' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \ {% endfor %} - cloudkitty_base_footer: | - # Backport of NOTNUMBOOL: https://review.opendev.org/c/openstack/cloudkitty/+/774084 - # Support customising Prometheus queries: https://review.opendev.org/c/openstack/cloudkitty/+/817275 - RUN pip install git+https://github.com/stackhpc/cloudkitty.git@stackhpc/wallaby - horizon_footer: | - # Fixes CloudKitty pricing panel: https://github.com/stackhpc/cloudkitty-dashboard/pull/1 - RUN pip install git+https://github.com/stackhpc/cloudkitty-dashboard.git@stackhpc/wallaby grafana_plugins_install: | RUN grafana-cli plugins install vonage-status-panel ironic_inspector_header: | From bc1fe950648d48b92d775544466f1c9e752e6d58 Mon Sep 17 00:00:00 2001 From: jovial Date: Wed, 19 Jan 2022 09:50:39 +0000 Subject: [PATCH 3/4] Remove comments These could go stale. At the time of writing we are carrying the following patches: horizon-plugin-cloudkitty-dashboard: - Fixes CloudKitty pricing panel: https://github.com/stackhpc/cloudkitty-dashboard/pull/1 cloudkitty-base: - Backport of NOTNUMBOOL: https://review.opendev.org/c/openstack/cloudkitty/+/774084 - Support customising Prometheus queries: https://review.opendev.org/c/openstack/cloudkitty/+/817275 --- etc/kayobe/kolla.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 185991f0f..dce849693 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -105,14 +105,10 @@ kolla_sources: location: "{{ kolla_bifrost_source_url }}" reference: "{{ kolla_bifrost_source_version }}" cloudkitty-base: - # Backport of NOTNUMBOOL: https://review.opendev.org/c/openstack/cloudkitty/+/774084 - # Support customising Prometheus queries: https://review.opendev.org/c/openstack/cloudkitty/+/817275 type: git location: https://github.com/stackhpc/cloudkitty.git reference: stackhpc/wallaby horizon-plugin-cloudkitty-dashboard: - # Fixes CloudKitty pricing panel: https://github.com/stackhpc/cloudkitty-dashboard/pull/1 - type: git location: https://github.com/stackhpc/cloudkitty-dashboard.git reference: stackhpc/wallaby ironic-inspector-additions-stackhpc-inspector-plugins: From 82b05a98a99d79205c14ad873dfa77e33e61225b Mon Sep 17 00:00:00 2001 From: jovial Date: Wed, 19 Jan 2022 10:38:33 +0000 Subject: [PATCH 4/4] Fixup for last commit The last commit removed more than just the comments. --- etc/kayobe/kolla.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index dce849693..45bde860f 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -109,6 +109,7 @@ kolla_sources: location: https://github.com/stackhpc/cloudkitty.git reference: stackhpc/wallaby horizon-plugin-cloudkitty-dashboard: + type: git location: https://github.com/stackhpc/cloudkitty-dashboard.git reference: stackhpc/wallaby ironic-inspector-additions-stackhpc-inspector-plugins: