starlingx
/
config
Code Issues Proposed changes

Rebase openstack-helm and openstack-helm-infra 

- Remove the mariadb force recovery override. With the rebase of
  openstack-helm-infra, mariadb now uses a configmap to track the
  grastate data. This allows for better recovery behavior across host
  reboot cycles.
- Add README.md to the RBD provisioner chart to track the last commit
  that this chart was validated against.

Change-Id: Idc007c6b696a206fb205d769e4664f702e209b75
Depends-On: Iacbdd666687b8bc12053f9d3dd833f9896a508cd
Story: 2003909
Task: 27632
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2018-11-14 00:22:47 -05:00
parent d5a090a45f
commit 6017642cf2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kubernetes/helm-charts/rbd-provisioner/README.md Normal file
View File

@ -0,0 +1,5 @@
RBD Provisioner Chart
-------------------------------------------------------------------------------
This chart was last validated with:
* Repo: https://github.com/kubernetes-incubator/external-storage.git
* Commit: (6776bba1) Merge pull request #1048 from AdamDang/patch-3

4
sysinv/sysinv/sysinv/sysinv/helm/mariadb.py
View File

@ -25,9 +25,6 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
return self.SUPPORTED_NAMESPACES
def get_overrides(self, namespace=None):
# NOTE: there is an intentional typo in "force_recovey" to match
# a typo in the upstream helm chart. This will eventually go away
# when we upgrade to the latest chart.
overrides = {
common.HELM_NS_OPENSTACK: {
'pod': {
@ -36,7 +33,6 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
}
},
'endpoints': self._get_endpoints_overrides(),
'force_recovey': 'mariadb-server-0',
}
}