openstack
/
kolla-kubernetes
Code Issues Proposed changes

Swithcing nova-compute-ironic to use statefulset 

Swithcing nova-compute-ironic to use statefulset

Change-Id: I8f6de41e0d8d7b46cfc4144b2ddfafaef1e5b3a3
This commit is contained in:
Serguei Bezverkhi 2017-03-08 20:14:55 -05:00
parent c532ed1585
commit 2cdd48e990
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm/microservice/nova-compute-ironic-daemonset/Chart.yaml → helm/microservice/nova-compute-ironic-statefulset/Chart.yaml
View File

@ -1,4 +1,4 @@
name: nova-compute-ironic-daemonset name: nova-compute-ironic-statefulset
version: 0.6.0-1 version: 0.6.0-1
description: Chart for nova compute ironic microservice description: Chart for nova compute ironic microservice
keywords: keywords:

0
helm/microservice/nova-compute-ironic-daemonset/requirements.yaml → helm/microservice/nova-compute-ironic-statefulset/requirements.yaml
View File

12
helm/microservice/nova-compute-ironic-daemonset/templates/nova-compute-ironic.yaml → helm/microservice/nova-compute-ironic-statefulset/templates/nova-compute-ironic.yaml
View File

@ -1,4 +1,4 @@
{{- $searchPath := ":global.kolla.nova.compute-ironic.daemonset:global.kolla.nova.compute-ironic.all:global.kolla.nova.all:global.kolla.all" }} {{- $searchPath := ":global.kolla.nova.compute-ironic.statefulset:global.kolla.nova.compute-ironic.all:global.kolla.nova.all:global.kolla.all" }}
{{- $resourceName := "nova-compute-ironic" }} {{- $resourceName := "nova-compute-ironic" }}
{{- $netHostTrue := false }} {{- $netHostTrue := false }}
{{- $podTypeBootstrap := false }} {{- $podTypeBootstrap := false }}
@ -15,16 +15,16 @@
{{- $selectorKey := include "kolla_val_get_str" (dict "key" "selector_key" "searchPath" $searchPath "Values" .Values ) }} {{- $selectorKey := include "kolla_val_get_str" (dict "key" "selector_key" "searchPath" $searchPath "Values" .Values ) }}
{{- $selectorValue := include "kolla_val_get_str" (dict "key" "selector_value" "searchPath" $searchPath "Values" .Values ) }} {{- $selectorValue := include "kolla_val_get_str" (dict "key" "selector_value" "searchPath" $searchPath "Values" .Values ) }}
{{- $tunnelInterface := "eth0" }} {{- $tunnelInterface := "eth0" }}
{{- $replicas := include "kolla_val_get_str" (dict "key" "replicas" "searchPath" $searchPath "Values" .Values ) }}
{{- $elementName := .Values.element_name | default $resourceName }} {{- $elementName := .Values.element_name | default $resourceName }}
{{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "imageFull" $imageFull "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "privileged" $privileged "Values" .Values "Release" .Release "searchPath" $searchPath }} {{- with $env := dict "netHostTrue" $netHostTrue "podTypeBootstrap" $podTypeBootstrap "imageFull" $imageFull "resourceName" $resourceName "serviceName" $serviceName "serviceType" $serviceType "privileged" $privileged "Values" .Values "Release" .Release "searchPath" $searchPath }}
apiVersion: extensions/v1beta1 apiVersion: apps/v1beta1
kind: DaemonSet kind: StatefulSet
metadata: metadata:
name: {{ $elementName }} name: {{ $elementName }}
labels:
component: {{ $serviceName }}
system: {{ $elementName }}
spec: spec:
serviceName: {{ $elementName }}
replicas: {{ $replicas }}
template: template:
metadata: metadata:
labels: labels:

4
helm/service/nova-compute-ironic/requirements.yaml
View File

@ -1,4 +1,4 @@
dependencies: dependencies:
- name: nova-compute-ironic-daemonset - name: nova-compute-ironic-statefulset
repository: file://../../microservice/nova-compute-ironic-daemonset repository: file://../../microservice/nova-compute-ironic-statefulset
version: 0.6.0-1 version: 0.6.0-1

2
helm/service/nova-compute-ironic/values.yaml
View File

@ -4,7 +4,7 @@ global:
kubernetes_entrypoint: true kubernetes_entrypoint: true
nova: nova:
compute-ironic: compute-ironic:
daemonset: statefulset:
dependencies: dependencies:
service: service:
- nova-metadata - nova-metadata

4
tests/bin/deploy_ironic.sh
View File

@ -84,8 +84,8 @@ helm install kolla/ironic-conductor-daemonset --version $VERSION \
--namespace kolla --name ironic-conductor-daemonset \ --namespace kolla --name ironic-conductor-daemonset \
--values /tmp/general_config.yaml --values /tmp/iscsi_config.yaml --values /tmp/general_config.yaml --values /tmp/iscsi_config.yaml
helm install kolla/nova-compute-ironic-daemonset --version $VERSION \ helm install kolla/nova-compute-ironic-statefulset --version $VERSION \
--namespace kolla --name nova-compute-ironic-daemonset \ --namespace kolla --name nova-compute-ironic-statefulset \
--values /tmp/general_config.yaml --values /tmp/iscsi_config.yaml --values /tmp/general_config.yaml --values /tmp/iscsi_config.yaml
$DIR/tools/pull_containers.sh kolla $DIR/tools/pull_containers.sh kolla

2
tools/setup_kubernetes.sh
View File

@ -8,7 +8,7 @@ cat <<"EOEF" > /etc/yum.repos.d/kubernetes.repo
name=Kubernetes name=Kubernetes
baseurl=http://yum.kubernetes.io/repos/kubernetes-el7-x86_64 baseurl=http://yum.kubernetes.io/repos/kubernetes-el7-x86_64
enabled=1 enabled=1
gpgcheck=1 gpgcheck=0
repo_gpgcheck=1 repo_gpgcheck=1
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg