openstack/openstack-helm
Code Issues Proposed changes

Magnum: Fix chart decomposition statements

Browse Source 
There were some errors inthe magnum chart decomposition values
and conditionals. This PS resolves them.

Change-Id: Ie3617c7431cf2a3379b5ede8af0838f833d0554c
This commit is contained in:
Pete Birley 2017-08-28 10:35:53 -05:00
parent ebf571fd45
commit 0f22d2b0e4
15 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/templates/deployment-api.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.deployment_api }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.api }} {{- $dependencies := .Values.dependencies.api }}
{{- $mounts_magnum_api := .Values.pod.mounts.magnum_api.magnum_api }} {{- $mounts_magnum_api := .Values.pod.mounts.magnum_api.magnum_api }}

2
magnum/templates/ingress-api.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.ingress_api }}
{{- $envAll := . }} {{- $envAll := . }}
{{- if .Values.network.api.ingress.public }} {{- if .Values.network.api.ingress.public }}
--- ---

2
magnum/templates/job-bootstrap.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.job_bootstrap }}
{{- $envAll := . }} {{- $envAll := . }}
{{- if .Values.bootstrap.enabled }} {{- if .Values.bootstrap.enabled }}
{{- $dependencies := .Values.dependencies.bootstrap }} {{- $dependencies := .Values.dependencies.bootstrap }}

2
magnum/templates/job-db-init.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.job_db_init }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_init }} {{- $dependencies := .Values.dependencies.db_init }}
--- ---

2
magnum/templates/job-db-sync.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.job_db_sync }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.db_sync }} {{- $dependencies := .Values.dependencies.db_sync }}
--- ---

2
magnum/templates/job-ks-endpoints.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.job_ks_endpoints }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_endpoints }} {{- $dependencies := .Values.dependencies.ks_endpoints }}
--- ---

2
magnum/templates/job-ks-service.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.job_ks_service }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_service }} {{- $dependencies := .Values.dependencies.ks_service }}
--- ---

2
magnum/templates/job-ks-user.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.job_ks_user }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_user }} {{- $dependencies := .Values.dependencies.ks_user }}
--- ---

2
magnum/templates/pdb-api.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.pdb_api }}
{{- $envAll := . }} {{- $envAll := . }}
--- ---
apiVersion: policy/v1beta1 apiVersion: policy/v1beta1

2
magnum/templates/secret-db.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.secret_db }}
{{- $envAll := . }} {{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }} {{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }} {{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}

2
magnum/templates/secret-keystone.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.secret_keystone }}
{{- $envAll := . }} {{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "user" }} {{- range $key1, $userClass := tuple "admin" "user" }}
{{- $secretName := index $envAll.Values.secrets.identity $userClass }} {{- $secretName := index $envAll.Values.secrets.identity $userClass }}

2
magnum/templates/service-api.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.service_api }}
{{- $envAll := . }} {{- $envAll := . }}
--- ---
apiVersion: v1 apiVersion: v1

2
magnum/templates/service-ingress-api.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.service_ingress_api }}
{{- $envAll := . }} {{- $envAll := . }}
{{- if .Values.network.api.ingress.public }} {{- if .Values.network.api.ingress.public }}
--- ---

2
magnum/templates/statefulset-conductor.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if .Values.manifests.configmap_etc }} {{- if .Values.manifests.statefulset_conductor }}
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.conductor }} {{- $dependencies := .Values.dependencies.conductor }}
{{- $mounts_magnum_conductor := .Values.pod.mounts.magnum_conductor.magnum_conductor }} {{- $mounts_magnum_conductor := .Values.pod.mounts.magnum_conductor.magnum_conductor }}

1
magnum/values.yaml
View File

@ -367,6 +367,5 @@ manifests:
secret_db: true secret_db: true
secret_keystone: true secret_keystone: true
service_api: true service_api: true
service_cfn: true
service_ingress_api: true service_ingress_api: true
statefulset_conductor: true statefulset_conductor: true