From 3ae22f65ea0f04b0a49a81f81af96e5a9646d46f Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Fri, 17 Oct 2014 23:33:32 +0000
Subject: [PATCH] Fixes k8s neutron pod image source and formatting
Previously, the k8s neutron pod was pulling the image from
danehans instead of kollaglue. Additionally, the formatting was
incorrect causing kube not to pull the image at all.
Change-Id: I6f787a432ffb9cae404f915ac5228ddcb88e877c
---
k8s/pod/neutron-controller-pod.yaml | 36 ++++++++++++++---------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/k8s/pod/neutron-controller-pod.yaml b/k8s/pod/neutron-controller-pod.yaml
index a3262a3659..b614bed419 100644
--- a/k8s/pod/neutron-controller-pod.yaml
+++ b/k8s/pod/neutron-controller-pod.yaml
@@ -5,24 +5,24 @@ desiredState:
source:
emptyDir: {}
containers:
- env:
- - name: DB_ROOT_PASSWORD
- value: password
- - name: NEUTRON_DB_PASSWORD
- value: password
- - name: NEUTRON_KEYSTONE_PASSWORD
- value: password
- - name: KEYSTONE_ADMIN_TOKEN
- value: ADMINTOKEN
- - name: NOVA_ADMIN_PASSWORD
- value: kolla
- image: danehans/fedora-rdo-neutron-server
- name: neutron-server
- ports:
- - containerPort: 9696
- volumeMounts:
- - name: neutron-data
- mountPath: /var/lib/neutron
+ - name: neutron-server
+ env:
+ - name: DB_ROOT_PASSWORD
+ value: password
+ - name: NEUTRON_DB_PASSWORD
+ value: password
+ - name: NEUTRON_KEYSTONE_PASSWORD
+ value: password
+ - name: KEYSTONE_ADMIN_TOKEN
+ value: ADMINTOKEN
+ - name: NOVA_ADMIN_PASSWORD
+ value: kolla
+ image: kollaglue/fedora-rdo-neutron-server
+ ports:
+ - containerPort: 9696
+ volumeMounts:
+ - name: neutron-data
+ mountPath: /var/lib/neutron
id: neutron-controller-1
version: v1beta1
id: neutron-controller