openstack
/
murano-apps
Code Issues Proposed changes

Fixes k8s deployment without Replication Controller 

UpdatePod execution plan was using field from Pod
definition that was present in v1beta1 API but is no
longer used in v1beta3

Change-Id: Ib57a0e5cc7104d5e1fa39b07644eab182a7fdf45
Closes-Bug: #1447594
(cherry picked from commit a680bf5899)
This commit is contained in:
Stan Lagun 2015-04-23 17:45:58 +03:00
parent 735771b6f6
commit 083ec59ab0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/Kubernetes/KubernetesCluster/package/Resources/UpdatePod.template
View File

@ -25,7 +25,7 @@ Body: |
with open(fileName, 'w') as f:
json.dump(args.podDefinition, f)
return updatePod('{0} {1} {2} {3}'.format(args.isNew, args.podDefinition['id'], args.podDefinition['kind'], fileName )).stdout
return updatePod('{0} {1} {2}'.format(args.isNew, args.podDefinition['metadata']['name'], fileName)).stdout
Scripts:
updatePod:

5
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/updatePod.sh
View File

@ -6,9 +6,8 @@ DEFINITION_DIR=/var/run/murano-kubernetes
mkdir -p $DEFINITION_DIR
podId=$2
kind=$3
fileName=$4
echo "$podId $kind $fileName" >> $DEFINITION_DIR/elements.list
fileName=$3
echo "$podId Pod $fileName" >> $DEFINITION_DIR/elements.list
if [ "$1" == "True" ]; then
#new Pod