From 1473bfe29c4726359418cbe1a6bfa0c93d731171 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Thu, 7 Apr 2022 16:46:38 -0500 Subject: [PATCH] Remove unsupported values overrides - neutron The neutron chart contains several values overrides for openstack releases that are no longer supported by openstack-helm. This change removes these overrides from the neutron chart. Change-Id: I9d2c73ca4a0157a77a1a73406a7e53dc44124547 --- neutron/Chart.yaml | 2 +- .../values_overrides/ocata-ubuntu_xenial.yaml | 20 ------------------ neutron/values_overrides/ocata.yaml | 9 -------- .../values_overrides/pike-ubuntu_xenial.yaml | 20 ------------------ neutron/values_overrides/pike.yaml | 9 -------- .../queens-ubuntu_xenial.yaml | 20 ------------------ .../values_overrides/rocky-opensuse_15.yaml | 20 ------------------ .../values_overrides/rocky-ubuntu_bionic.yaml | 21 ------------------- .../values_overrides/rocky-ubuntu_xenial.yaml | 20 ------------------ releasenotes/notes/neutron.yaml | 1 + 10 files changed, 2 insertions(+), 140 deletions(-) delete mode 100644 neutron/values_overrides/ocata-ubuntu_xenial.yaml delete mode 100644 neutron/values_overrides/ocata.yaml delete mode 100644 neutron/values_overrides/pike-ubuntu_xenial.yaml delete mode 100644 neutron/values_overrides/pike.yaml delete mode 100644 neutron/values_overrides/queens-ubuntu_xenial.yaml delete mode 100644 neutron/values_overrides/rocky-opensuse_15.yaml delete mode 100644 neutron/values_overrides/rocky-ubuntu_bionic.yaml delete mode 100644 neutron/values_overrides/rocky-ubuntu_xenial.yaml diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index 6e03fdab30..a4502bc3bf 100644 --- a/neutron/Chart.yaml +++ b/neutron/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Neutron name: neutron -version: 0.2.14 +version: 0.2.15 home: https://docs.openstack.org/neutron/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png sources: diff --git a/neutron/values_overrides/ocata-ubuntu_xenial.yaml b/neutron/values_overrides/ocata-ubuntu_xenial.yaml deleted file mode 100644 index 635ac90a76..0000000000 --- a/neutron/values_overrides/ocata-ubuntu_xenial.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -images: - tags: - bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" - db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" - db_drop: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" - ks_service: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" - ks_endpoints: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" - neutron_db_sync: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_dhcp: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_l3: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_metadata: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_server: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial" - neutron_sriov_agent: docker.io/openstackhelm/neutron:ocata-18.04-sriov - neutron_sriov_agent_init: docker.io/openstackhelm/neutron:ocata-18.04-sriov -... diff --git a/neutron/values_overrides/ocata.yaml b/neutron/values_overrides/ocata.yaml deleted file mode 100644 index 1fe0098e99..0000000000 --- a/neutron/values_overrides/ocata.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -conf: - # api-paste entrypoint neutron.api.versions:Versions.factory was deprecated in Queens - # See https://docs.openstack.org/releasenotes/neutron/queens.html - # This configuration is put in for pre-Queens release. - paste: - app:neutronversions: - paste.app_factory: neutron.api.versions:Versions.factory -... diff --git a/neutron/values_overrides/pike-ubuntu_xenial.yaml b/neutron/values_overrides/pike-ubuntu_xenial.yaml deleted file mode 100644 index 5993caf381..0000000000 --- a/neutron/values_overrides/pike-ubuntu_xenial.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -images: - tags: - bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" - db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" - db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" - ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" - ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" - neutron_db_sync: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_dhcp: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_l3: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_l2gw: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_metadata: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_server: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" - neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial" -... diff --git a/neutron/values_overrides/pike.yaml b/neutron/values_overrides/pike.yaml deleted file mode 100644 index 1fe0098e99..0000000000 --- a/neutron/values_overrides/pike.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -conf: - # api-paste entrypoint neutron.api.versions:Versions.factory was deprecated in Queens - # See https://docs.openstack.org/releasenotes/neutron/queens.html - # This configuration is put in for pre-Queens release. - paste: - app:neutronversions: - paste.app_factory: neutron.api.versions:Versions.factory -... diff --git a/neutron/values_overrides/queens-ubuntu_xenial.yaml b/neutron/values_overrides/queens-ubuntu_xenial.yaml deleted file mode 100644 index d0136688bb..0000000000 --- a/neutron/values_overrides/queens-ubuntu_xenial.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -images: - tags: - bootstrap: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" - db_init: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" - db_drop: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" - ks_service: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" - ks_endpoints: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" - neutron_db_sync: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_dhcp: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_l3: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_l2gw: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_metadata: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_server: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" - neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:queens-ubuntu_xenial" -... diff --git a/neutron/values_overrides/rocky-opensuse_15.yaml b/neutron/values_overrides/rocky-opensuse_15.yaml deleted file mode 100644 index 32582e6fa7..0000000000 --- a/neutron/values_overrides/rocky-opensuse_15.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -images: - tags: - bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15" - db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15" - db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15" - ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15" - ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15" - ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15" - neutron_db_sync: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_dhcp: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_l3: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_l2gw: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_metadata: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_server: "docker.io/openstackhelm/neutron:rocky-opensuse_15" - neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:rocky-opensuse_15" -... diff --git a/neutron/values_overrides/rocky-ubuntu_bionic.yaml b/neutron/values_overrides/rocky-ubuntu_bionic.yaml deleted file mode 100644 index a0def9e187..0000000000 --- a/neutron/values_overrides/rocky-ubuntu_bionic.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -images: - tags: - bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" - db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" - db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" - ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" - ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" - ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" - neutron_db_sync: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_dhcp: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_l3: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_l2gw: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_metadata: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_server: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_rpc_server: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" - neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:rocky-ubuntu_bionic" -... diff --git a/neutron/values_overrides/rocky-ubuntu_xenial.yaml b/neutron/values_overrides/rocky-ubuntu_xenial.yaml deleted file mode 100644 index e0caedcedf..0000000000 --- a/neutron/values_overrides/rocky-ubuntu_xenial.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -images: - tags: - bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" - db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" - db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" - ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" - ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" - neutron_db_sync: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_dhcp: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_l3: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_l2gw: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_metadata: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_netns_cleanup_cron: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_server: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" - neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:rocky-ubuntu_xenial" -... diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml index c97dc99d41..31afabd186 100644 --- a/releasenotes/notes/neutron.yaml +++ b/releasenotes/notes/neutron.yaml @@ -28,4 +28,5 @@ neutron: - 0.2.12 Fix infinite recursion deadlock on netns cleanup cron - 0.2.13 Enable taint toleration for Openstack services - 0.2.14 Migrate IP from bridge for auto_bridge_add + - 0.2.15 Remove unsupported values overrides ...