openstack/openstack-helm
Code Issues Proposed changes

fixes bugs in deployment

Browse Source
This commit is contained in:
Brandon B. Jozsa 2016-12-23 15:31:10 -05:00
parent 501a19f74c
commit c6dd9b617f
4 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

@ -1,4 +1,4 @@
.PHONY: ceph bootstrap mariadb keystone memcached rabbitmq common openstack all clean
.PHONY: ceph bootstrap mariadb keystone memcached rabbitmq common openstack all clean
B64_DIRS := common/secrets
B64_EXCLUDE := $(wildcard common/secrets/*.b64)
@ -6,10 +6,11 @@ B64_EXCLUDE := $(wildcard common/secrets/*.b64)
CHARTS := ceph mariadb rabbitmq GLANCE memcached keystone glance openstack
COMMON_TPL := common/templates/_globals.tpl
all: common bootstrap mariadb rabbitmq memcached keystone glance openstack
all: ceph common bootstrap mariadb rabbitmq memcached keystone glance openstack
common: build-common
#ceph: nolint-build-ceph
ceph: build-ceph
bootstrap: build-bootstrap
@ -22,18 +23,25 @@ rabbitmq: build-rabbitmq
glance: build-glance
memcached: build-memcached
memcached: build-memcached
openstack: build-openstack
clean:
$(shell rm -rf common/secrets/*.b64)
$(shell rm -rf */templates/_partials.tpl)
$(shell rm -rf */templates/_globals.tpl)
echo "Removed all .b64, _partials.tpl, and _globals.tpl files"
clean:
$(shell rm -rf common/secrets/*.b64)
$(shell rm -rf */templates/_partials.tpl)
$(shell rm -rf */templates/_globals.tpl)
echo "Removed all .b64, _partials.tpl, and _globals.tpl files"
build-%:
if [ -f $*/Makefile ]; then make -C $*; fi
if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
helm lint $*
helm package $*
if [ -f $*/Makefile ]; then make -C $*; fi
if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
helm lint $*
helm package $*
## this is required for some charts which cannot pass a lint, namely
## those which use .Release.Namespace in a default pipe capacity
#nolint-build-%:
# if [ -f $*/Makefile ]; then make -C $*; fi
# if [ -f $*/requirements.yaml ]; then helm dep up $*; fi
# helm package $*

2
bootstrap/Chart.yaml
View File

@ -1,4 +1,4 @@
apiVersion: v1
description: aic-helm namespace bootstrap
description: openstack-helm namespace bootstrap
name: bootstrap
version: 0.1.0

5
ceph/templates/storage.yaml
View File

@ -7,10 +7,11 @@ metadata:
name: {{ .Values.storageclass.name }}
provisioner: kubernetes.io/rbd
parameters:
monitors: {{ .Values.storageclass.monitors | default "ceph.{{ .Release.Namespace }}:6789" }}
monitors: {{ .Values.storageclass.monitors | default "ceph-mon.ceph:6789" }}
adminId: {{ .Values.storageclass.admin_id }}
adminSecretName: {{ .Values.storageclass.admin_secret_name }}
adminSecretNamespace: {{ .Values.storageclass.admin_secret_namespace | default "{{ .Release.Namespace }}" }}
## forcing namespace due to issue with -- default "{{ .Release.Namespace }}" }} --
adminSecretNamespace: {{ .Values.storageclass.admin_secret_namespace | default "ceph" }}
pool: {{ .Values.storageclass.pool }}
userId: {{ .Values.storageclass.user_id }}
userSecretName: {{ .Values.storageclass.user_secret_name }}

6
ceph/values.yaml
View File

@ -59,10 +59,10 @@ secrets:
storageclass:
provision_storage_class: true
name: general
monitors: nil
monitors: null
pool: rbd
admin_id: admin
admin_secret_name: pvc-ceph-conf-combined-storageclass
admin_secret_namespace: nil
admin_secret_namespace: null
user_id: admin
user_secret_name: pvc-ceph-client-key
user_secret_name: pvc-ceph-client-key