From bedaa714d2874455a39abefc50446535d4113408 Mon Sep 17 00:00:00 2001 From: Gage Hugo <gagehugo@gmail.com> Date: Thu, 31 Mar 2022 16:14:37 -0500 Subject: [PATCH] Remove pre-train release overrides from keystone This change removes all the pre-train values overrides from the keystone chart since openstack-helm does not support them anymore. Change-Id: I2a69451167d3ec4b938ba773e4bbf5a4d17683e0 --- keystone/Chart.yaml | 2 +- .../values_overrides/ocata-ubuntu_xenial.yaml | 16 ---------- keystone/values_overrides/opensuse_15.yaml | 31 ------------------- .../values_overrides/pike-ubuntu_xenial.yaml | 16 ---------- .../queens-ubuntu_xenial.yaml | 16 ---------- .../values_overrides/rocky-opensuse_15.yaml | 16 ---------- .../values_overrides/rocky-ubuntu_bionic.yaml | 16 ---------- .../values_overrides/rocky-ubuntu_xenial.yaml | 16 ---------- releasenotes/notes/keystone.yaml | 1 + 9 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 keystone/values_overrides/ocata-ubuntu_xenial.yaml delete mode 100644 keystone/values_overrides/opensuse_15.yaml delete mode 100644 keystone/values_overrides/pike-ubuntu_xenial.yaml delete mode 100644 keystone/values_overrides/queens-ubuntu_xenial.yaml delete mode 100644 keystone/values_overrides/rocky-opensuse_15.yaml delete mode 100644 keystone/values_overrides/rocky-ubuntu_bionic.yaml delete mode 100644 keystone/values_overrides/rocky-ubuntu_xenial.yaml diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml index 6e9d4ff8af..507ec28dd5 100644 --- a/keystone/Chart.yaml +++ b/keystone/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Keystone name: keystone -version: 0.2.21 +version: 0.2.22 home: https://docs.openstack.org/keystone/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png sources: diff --git a/keystone/values_overrides/ocata-ubuntu_xenial.yaml b/keystone/values_overrides/ocata-ubuntu_xenial.yaml deleted file mode 100644 index 029b362e2a..0000000000 --- a/keystone/values_overrides/ocata-ubuntu_xenial.yaml +++ /dev/null @@ -1,16 +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" - keystone_api: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial" - keystone_bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" - keystone_credential_rotate: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial" - keystone_credential_setup: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial" - keystone_db_sync: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial" - keystone_domain_manage: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial" - keystone_fernet_rotate: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial" - keystone_fernet_setup: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial" -... diff --git a/keystone/values_overrides/opensuse_15.yaml b/keystone/values_overrides/opensuse_15.yaml deleted file mode 100644 index f2f708d838..0000000000 --- a/keystone/values_overrides/opensuse_15.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -conf: - software: - apache2: - binary: apache2ctl - start_parameters: -DFOREGROUND -k start - site_dir: /etc/apache2/vhosts.d - conf_dir: /etc/apache2/conf.d - a2enmod: - - version - security: | - <Directory "/var/www"> - Options Indexes FollowSymLinks - AllowOverride All - <IfModule !mod_access_compat.c> - Require all granted - </IfModule> - <IfModule mod_access_compat.c> - Order allow,deny - Allow from all - </IfModule> - </Directory> -pod: - security_context: - keystone: - pod: - runAsUser: 0 - container: - keystone_api: - readOnlyRootFilesystem: false -... diff --git a/keystone/values_overrides/pike-ubuntu_xenial.yaml b/keystone/values_overrides/pike-ubuntu_xenial.yaml deleted file mode 100644 index ed5a8a2544..0000000000 --- a/keystone/values_overrides/pike-ubuntu_xenial.yaml +++ /dev/null @@ -1,16 +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" - keystone_api: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial" - keystone_bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" - keystone_credential_rotate: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial" - keystone_credential_setup: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial" - keystone_db_sync: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial" - keystone_domain_manage: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial" - keystone_fernet_rotate: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial" - keystone_fernet_setup: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial" -... diff --git a/keystone/values_overrides/queens-ubuntu_xenial.yaml b/keystone/values_overrides/queens-ubuntu_xenial.yaml deleted file mode 100644 index a73ef945d3..0000000000 --- a/keystone/values_overrides/queens-ubuntu_xenial.yaml +++ /dev/null @@ -1,16 +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" - keystone_api: "docker.io/openstackhelm/keystone:queens-ubuntu_xenial" - keystone_bootstrap: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" - keystone_credential_rotate: "docker.io/openstackhelm/keystone:queens-ubuntu_xenial" - keystone_credential_setup: "docker.io/openstackhelm/keystone:queens-ubuntu_xenial" - keystone_db_sync: "docker.io/openstackhelm/keystone:queens-ubuntu_xenial" - keystone_domain_manage: "docker.io/openstackhelm/keystone:queens-ubuntu_xenial" - keystone_fernet_rotate: "docker.io/openstackhelm/keystone:queens-ubuntu_xenial" - keystone_fernet_setup: "docker.io/openstackhelm/keystone:queens-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:queens-ubuntu_xenial" -... diff --git a/keystone/values_overrides/rocky-opensuse_15.yaml b/keystone/values_overrides/rocky-opensuse_15.yaml deleted file mode 100644 index cc7bd0ff84..0000000000 --- a/keystone/values_overrides/rocky-opensuse_15.yaml +++ /dev/null @@ -1,16 +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" - keystone_api: "docker.io/openstackhelm/keystone:rocky-opensuse_15" - keystone_bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15" - keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15" - keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15" - keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-opensuse_15" - keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-opensuse_15" - keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15" - keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15" - ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15" -... diff --git a/keystone/values_overrides/rocky-ubuntu_bionic.yaml b/keystone/values_overrides/rocky-ubuntu_bionic.yaml deleted file mode 100644 index 93d0a84068..0000000000 --- a/keystone/values_overrides/rocky-ubuntu_bionic.yaml +++ /dev/null @@ -1,16 +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" - keystone_api: "docker.io/openstackhelm/keystone:rocky-ubuntu_bionic" - keystone_bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" - keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-ubuntu_bionic" - keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-ubuntu_bionic" - keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-ubuntu_bionic" - keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-ubuntu_bionic" - keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-ubuntu_bionic" - keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-ubuntu_bionic" - ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic" -... diff --git a/keystone/values_overrides/rocky-ubuntu_xenial.yaml b/keystone/values_overrides/rocky-ubuntu_xenial.yaml deleted file mode 100644 index 49f1cb0902..0000000000 --- a/keystone/values_overrides/rocky-ubuntu_xenial.yaml +++ /dev/null @@ -1,16 +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" - keystone_api: "docker.io/openstackhelm/keystone:rocky-ubuntu_xenial" - keystone_bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" - keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-ubuntu_xenial" - keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-ubuntu_xenial" - keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-ubuntu_xenial" - keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-ubuntu_xenial" - keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-ubuntu_xenial" - keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-ubuntu_xenial" - ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial" -... diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml index 14d12cc2fb..13ed5ed0bc 100644 --- a/releasenotes/notes/keystone.yaml +++ b/releasenotes/notes/keystone.yaml @@ -37,4 +37,5 @@ keystone: - 0.2.19 Revert Reduce log chattiness - 0.2.20 Enable taint toleration for Openstack services - 0.2.21 Updated naming for subchart compatibility + - 0.2.22 Remove older values overrides ...