openstack/openstack-helm
Code Issues Proposed changes

Ceph: add manifests optional for job-rbd-pool

Browse Source 
Every manifests has to be controlled by manifests key in values.yaml.
In ceph, job-rbd-pool doesn't have manifests value,
so it can't be disabled.

When using already installed ceph, it is necessary to disable
job-rbd-pool because it is an unnecessary.

Change-Id: Idf61855423f28fbb1c7730118869bdddc463960b
Closes-bug: 1742017
This commit is contained in:
Jaesang Lee 2018-01-09 10:38:32 +09:00
parent aaff2ce6ba
commit beadf984d4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/templates/job-rbd-pool.yaml
View File

@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_rbd_pool }}
{{- if .Values.deployment.ceph }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.rbd_pool }}
@ -95,3 +96,4 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.admin }}
{{- end }}
{{- end }}

1
ceph/values.yaml
View File

@ -451,6 +451,7 @@ manifests:
job_ks_user: true
job_namespace_client_key_cleaner: true
job_namespace_client_key: true
job_rbd_pool: true
job_storage_admin_keys: true
secret_keystone_rgw: true
secret_keystone: true