From d73c7c494dcd79feca4538669c52af375a1fc358 Mon Sep 17 00:00:00 2001 From: Mihnea Saracin Date: Wed, 12 Aug 2020 15:38:42 +0000 Subject: [PATCH] Revert "Fix apply of stx-openstack when host is locked" The commit that we are reverting broke the normal lock/unlock case when stx-openstack is applied. More specifically, the mariadb pod failed to start when stx-openstack was applied automatically after unlock. This reverts commit 754a1d33de7e16b454052190a2496f1a1d59c707. Change-Id: I0f1e5854d22ed54747d0237153ada3985f29ef96 --- .../centos/openstack-helm-infra.spec | 4 +-- ...12-Add-tolerations-to-rabbitmq-chart.patch | 26 ------------------- ...f.database.config_override-for-mari.patch} | 0 .../k8sapp_openstack/helm/aodh.py | 8 +++--- .../k8sapp_openstack/helm/barbican.py | 2 +- .../k8sapp_openstack/helm/ceilometer.py | 4 +-- .../k8sapp_openstack/helm/cinder.py | 8 +++--- .../k8sapp_openstack/helm/fm_rest_api.py | 2 +- .../k8sapp_openstack/helm/glance.py | 2 +- .../k8sapp_openstack/helm/gnocchi.py | 2 +- .../k8sapp_openstack/helm/heat.py | 8 +++--- .../k8sapp_openstack/helm/ingress.py | 4 +-- .../k8sapp_openstack/helm/ironic.py | 4 +-- .../k8sapp_openstack/helm/keystone.py | 2 +- .../k8sapp_openstack/helm/magnum.py | 4 +-- .../k8sapp_openstack/helm/mariadb.py | 4 +-- .../k8sapp_openstack/helm/neutron.py | 2 +- .../k8sapp_openstack/helm/nova.py | 14 +++++----- .../k8sapp_openstack/helm/nova_api_proxy.py | 2 +- .../k8sapp_openstack/helm/panko.py | 2 +- .../k8sapp_openstack/helm/placement.py | 2 +- .../manifests/manifest.yaml | 3 --- 22 files changed, 39 insertions(+), 70 deletions(-) delete mode 100644 openstack-helm-infra/files/0012-Add-tolerations-to-rabbitmq-chart.patch rename openstack-helm-infra/files/{0013-enable-Values.conf.database.config_override-for-mari.patch => 0012-enable-Values.conf.database.config_override-for-mari.patch} (100%) diff --git a/openstack-helm-infra/centos/openstack-helm-infra.spec b/openstack-helm-infra/centos/openstack-helm-infra.spec index f4d380e20..a8a14c515 100644 --- a/openstack-helm-infra/centos/openstack-helm-infra.spec +++ b/openstack-helm-infra/centos/openstack-helm-infra.spec @@ -26,8 +26,7 @@ Patch08: 0008-Fix-rabbitmq-could-not-bind-port-to-ipv6-address-iss.patch Patch09: 0009-Enable-override-of-mariadb-server-probe-parameters.patch Patch10: 0010-Mariadb-use-utf8_general_ci-collation-as-default.patch Patch11: 0011-Add-mariadb-database-config-override-to-support-ipv6.patch -Patch12: 0012-Add-tolerations-to-rabbitmq-chart.patch -Patch13: 0013-enable-Values.conf.database.config_override-for-mari.patch +Patch12: 0012-enable-Values.conf.database.config_override-for-mari.patch BuildRequires: helm BuildRequires: chartmuseum @@ -49,7 +48,6 @@ Openstack Helm Infra charts %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 -p1 %build # Host a server for the charts diff --git a/openstack-helm-infra/files/0012-Add-tolerations-to-rabbitmq-chart.patch b/openstack-helm-infra/files/0012-Add-tolerations-to-rabbitmq-chart.patch deleted file mode 100644 index 3a7fdc552..000000000 --- a/openstack-helm-infra/files/0012-Add-tolerations-to-rabbitmq-chart.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c8f3a96fad3344cfdb058c7c0fee77431f77a001 Mon Sep 17 00:00:00 2001 -From: Mihnea Saracin -Date: Wed, 22 Jul 2020 15:53:25 +0300 -Subject: [PATCH] Add tolerations to rabbitmq chart - -Signed-off-by: Mihnea Saracin ---- - rabbitmq/templates/statefulset.yaml | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml -index 9e40a103..cf5d1811 100644 ---- a/rabbitmq/templates/statefulset.yaml -+++ b/rabbitmq/templates/statefulset.yaml -@@ -85,6 +85,8 @@ spec: - {{ tuple $envAll "rabbitmq" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} - nodeSelector: - {{ $envAll.Values.labels.server.node_selector_key }}: {{ $envAll.Values.labels.server.node_selector_value | quote }} -+ tolerations: -+{{ toYaml .Values.tolerations | indent 8 }} - initContainers: - {{ tuple $envAll "rabbitmq" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - - name: rabbitmq-password --- -2.17.1 - diff --git a/openstack-helm-infra/files/0013-enable-Values.conf.database.config_override-for-mari.patch b/openstack-helm-infra/files/0012-enable-Values.conf.database.config_override-for-mari.patch similarity index 100% rename from openstack-helm-infra/files/0013-enable-Values.conf.database.config_override-for-mari.patch rename to openstack-helm-infra/files/0012-enable-Values.conf.database.config_override-for-mari.patch diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py index f4f5ed158..c55af1956 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/aodh.py @@ -39,10 +39,10 @@ class AodhHelm(openstack.OpenstackBaseHelm): def _get_pod_overrides(self): overrides = { 'replicas': { - 'api': self._num_provisioned_controllers(), - 'evaluator': self._num_provisioned_controllers(), - 'listener': self._num_provisioned_controllers(), - 'notifier': self._num_provisioned_controllers() + 'api': self._num_controllers(), + 'evaluator': self._num_controllers(), + 'listener': self._num_controllers(), + 'notifier': self._num_controllers() } } return overrides diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py index 941f722ca..edd98c649 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/barbican.py @@ -23,7 +23,7 @@ class BarbicanHelm(openstack.OpenstackBaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'api': self._num_provisioned_controllers() + 'api': self._num_controllers() } }, 'endpoints': self._get_endpoints_overrides(), diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py index a4f3bf6ba..cab4c820f 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ceilometer.py @@ -41,8 +41,8 @@ class CeilometerHelm(openstack.OpenstackBaseHelm): def _get_pod_overrides(self): return { 'replicas': { - 'central': self._num_provisioned_controllers(), - 'notification': self._num_provisioned_controllers() + 'central': self._num_controllers(), + 'notification': self._num_controllers() } } diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py index 603ddf0b4..71afbce90 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py @@ -49,10 +49,10 @@ class CinderHelm(openstack.OpenstackBaseHelm): } }, 'replicas': { - 'api': self._num_provisioned_controllers(), - 'volume': self._num_provisioned_controllers(), - 'scheduler': self._num_provisioned_controllers(), - 'backup': self._num_provisioned_controllers() + 'api': self._num_controllers(), + 'volume': self._num_controllers(), + 'scheduler': self._num_controllers(), + 'backup': self._num_controllers() } }, 'conf': { diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py index 38b2cfd92..360e0ff5a 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/fm_rest_api.py @@ -27,7 +27,7 @@ class FmRestApiHelm(openstack.OpenstackBaseHelm): 'endpoints': self._get_endpoints_overrides(), 'pod': { 'replicas': { - 'api': self._num_provisioned_controllers() + 'api': self._num_controllers() }, }, } diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py index e84c88955..dc954fe3f 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/glance.py @@ -51,7 +51,7 @@ class GlanceHelm(openstack.OpenstackBaseHelm): replicas_count = 1 ceph_backend = self._get_primary_ceph_backend() if ceph_backend: - replicas_count = self._num_provisioned_controllers() + replicas_count = self._num_controllers() return { 'replicas': { diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py index 9e98d647a..b9fe09bbc 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/gnocchi.py @@ -39,7 +39,7 @@ class GnocchiHelm(openstack.OpenstackBaseHelm): def _get_pod_overrides(self): return { 'replicas': { - 'api': self._num_provisioned_controllers() + 'api': self._num_controllers() } } diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py index f356fbb0f..eb75a9afd 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py @@ -38,10 +38,10 @@ class HeatHelm(openstack.OpenstackBaseHelm): def _get_pod_overrides(self): return { 'replicas': { - 'api': self._num_provisioned_controllers(), - 'cfn': self._num_provisioned_controllers(), - 'cloudwatch': self._num_provisioned_controllers(), - 'engine': self._num_provisioned_controllers() + 'api': self._num_controllers(), + 'cfn': self._num_controllers(), + 'cloudwatch': self._num_controllers(), + 'engine': self._num_controllers() } } diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py index fd9878fed..8df7229ac 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ingress.py @@ -62,8 +62,8 @@ class IngressHelm(base.BaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'ingress': self._num_provisioned_controllers(), - 'error_page': self._num_provisioned_controllers() + 'ingress': self._num_controllers(), + 'error_page': self._num_controllers() }, 'resources': { 'enabled': limit_enabled, diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py index 8e40e1ecf..a2068af4a 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/ironic.py @@ -45,8 +45,8 @@ class IronicHelm(openstack.OpenstackBaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'api': self._num_provisioned_controllers(), - 'conductor': self._num_provisioned_controllers() + 'api': self._num_controllers(), + 'conductor': self._num_controllers() } }, 'network': self._get_network_overrides(), diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py index f41f0e581..d81164681 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py @@ -49,7 +49,7 @@ class KeystoneHelm(openstack.OpenstackBaseHelm): def _get_pod_overrides(self): overrides = { 'replicas': { - 'api': self._num_provisioned_controllers() + 'api': self._num_controllers() }, 'lifecycle': { 'termination_grace_period': { diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py index 9ecd32b93..75e45a26c 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/magnum.py @@ -24,8 +24,8 @@ class MagnumHelm(openstack.OpenstackBaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'api': self._num_provisioned_controllers(), - 'conductor': self._num_provisioned_controllers() + 'api': self._num_controllers(), + 'conductor': self._num_controllers() } } } diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py index a7e685363..c2e081c91 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/mariadb.py @@ -25,8 +25,8 @@ class MariadbHelm(openstack.OpenstackBaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'server': self._num_provisioned_controllers(), - 'ingress': self._num_provisioned_controllers() + 'server': self._num_server_replicas(), + 'ingress': self._num_controllers() } }, 'endpoints': self._get_endpoints_overrides(), diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py index ec68c8bef..ac00a0b6d 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/neutron.py @@ -49,7 +49,7 @@ class NeutronHelm(openstack.OpenstackBaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'server': self._num_provisioned_controllers() + 'server': self._num_controllers() }, }, 'conf': { diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py index e8a54f1bc..bd7f0f74d 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py @@ -107,13 +107,13 @@ class NovaHelm(openstack.OpenstackBaseHelm): } }, 'replicas': { - 'api_metadata': self._num_provisioned_controllers(), - 'placement': self._num_provisioned_controllers(), - 'osapi': self._num_provisioned_controllers(), - 'conductor': self._num_provisioned_controllers(), - 'consoleauth': self._num_provisioned_controllers(), - 'scheduler': self._num_provisioned_controllers(), - 'novncproxy': self._num_provisioned_controllers() + 'api_metadata': self._num_controllers(), + 'placement': self._num_controllers(), + 'osapi': self._num_controllers(), + 'conductor': self._num_controllers(), + 'consoleauth': self._num_controllers(), + 'scheduler': self._num_controllers(), + 'novncproxy': self._num_controllers() } }, 'conf': { diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py index e2c373715..727254dfe 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py @@ -30,7 +30,7 @@ class NovaApiProxyHelm(openstack.OpenstackBaseHelm): } }, 'replicas': { - 'proxy': self._num_provisioned_controllers() + 'proxy': self._num_controllers() } }, 'conf': { diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/panko.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/panko.py index d01e3cf1b..34bc457e3 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/panko.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/panko.py @@ -38,7 +38,7 @@ class PankoHelm(openstack.OpenstackBaseHelm): def _get_pod_overrides(self): overrides = { 'replicas': { - 'api': self._num_provisioned_controllers() + 'api': self._num_controllers() } } return overrides diff --git a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py index 702e1114d..3cd060a35 100644 --- a/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py +++ b/python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/placement.py @@ -26,7 +26,7 @@ class PlacementHelm(openstack.OpenstackBaseHelm): common.HELM_NS_OPENSTACK: { 'pod': { 'replicas': { - 'api': self._num_provisioned_controllers() + 'api': self._num_controllers() } }, 'endpoints': self._get_endpoints_overrides() diff --git a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml index 1bcd38e7f..85d46d1fa 100644 --- a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml +++ b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml @@ -340,9 +340,6 @@ data: # filesystem race as seen in the LP. volume: size: 1Gi - tolerations: - - effect: NoExecute - operator: Exists source: type: tar location: http://172.17.0.1/helm_charts/starlingx/rabbitmq-0.1.0.tgz