Swithcing nova-compute-ironic to use statefulset

Swithcing nova-compute-ironic to use statefulset Change-Id: I8f6de41e0d8d7b46cfc4144b2ddfafaef1e5b3a3
openstack-archive · Mar 9, 2017 · 2cdd48e · 2cdd48e
1 parent c532ed1
commit 2cdd48e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.../nova-compute-ironic-daemonset/Chart.yaml → ...ova-compute-ironic-statefulset/Chart.yaml b/.../nova-compute-ironic-daemonset/Chart.yaml → ...ova-compute-ironic-statefulset/Chart.yaml
@@ -1,4 +1,4 @@
-name: nova-compute-ironic-daemonset
+name: nova-compute-ironic-statefulset
 version: 0.6.0-1
 description: Chart for nova compute ironic microservice
 keywords:

diff --git a/...ompute-ironic-daemonset/requirements.yaml → ...pute-ironic-statefulset/requirements.yaml b/...ompute-ironic-daemonset/requirements.yaml → ...pute-ironic-statefulset/requirements.yaml
diff --git a/...monset/templates/nova-compute-ironic.yaml → ...fulset/templates/nova-compute-ironic.yaml b/...monset/templates/nova-compute-ironic.yaml → ...fulset/templates/nova-compute-ironic.yaml
@@ -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" }}
 {{- $netHostTrue := false }}
 {{- $podTypeBootstrap := false }}
@@ -15,16 +15,16 @@
 {{- $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 ) }}
 {{- $tunnelInterface := "eth0" }}
+{{- $replicas := include "kolla_val_get_str" (dict "key" "replicas" "searchPath" $searchPath "Values" .Values ) }}
 {{- $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 }}
-apiVersion: extensions/v1beta1
-kind: DaemonSet
+apiVersion: apps/v1beta1
+kind: StatefulSet
 metadata:
   name: {{ $elementName }}
-  labels:
-    component: {{ $serviceName }}
-    system: {{ $elementName }}
 spec:
+  serviceName: {{ $elementName }}
+  replicas: {{ $replicas }}
   template:
     metadata:
       labels:

diff --git a/helm/service/nova-compute-ironic/requirements.yaml b/helm/service/nova-compute-ironic/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
-  - name: nova-compute-ironic-daemonset
-    repository: file://../../microservice/nova-compute-ironic-daemonset
+  - name: nova-compute-ironic-statefulset
+    repository: file://../../microservice/nova-compute-ironic-statefulset
     version: 0.6.0-1
diff --git a/helm/service/nova-compute-ironic/values.yaml b/helm/service/nova-compute-ironic/values.yaml
@@ -4,7 +4,7 @@ global:
             kubernetes_entrypoint: true
         nova:
             compute-ironic:
-                daemonset:
+                statefulset:
                     dependencies:
                         service:
                         - nova-metadata

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

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