From 558dcb5f56cf52a949fecc580ef1e359a1c6cb30 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Thu, 16 Oct 2014 11:15:33 -0400
Subject: [PATCH] fix nova-controller pod

remove nova-controller image, which is not meant to be started directly.
add required NEUTRON_SHARED_SECRET environment variable.

Change-Id: Id671c5473db8e6e222b16ccdfd9eaedc872c60fa
---
 k8s/pod/nova-controller-pod.yaml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/k8s/pod/nova-controller-pod.yaml b/k8s/pod/nova-controller-pod.yaml
index 9e75826984..3b432bb6ac 100644
--- a/k8s/pod/nova-controller-pod.yaml
+++ b/k8s/pod/nova-controller-pod.yaml
@@ -8,19 +8,8 @@ desiredState:
         value: novadbpassword
       - name: KEYSTONE_ADMIN_TOKEN
         value: ADMINTOKEN
-      image: kollaglue/fedora-rdo-nova-controller
-      name: nova-controller
-      ports:
-      - containerPort: 8773
-      - containerPort: 8774
-      - containerPort: 8775
-    - env:
-      - name: DB_ROOT_PASSWORD
-        value: password
-      - name: NOVA_DB_PASSWORD
-        value: novadbpassword
-      - name: KEYSTONE_ADMIN_TOKEN
-        value: ADMINTOKEN
+      - name: NEUTRON_SHARED_SECRET
+        value: sharedsecret
       image: kollaglue/fedora-rdo-nova-conductor
       name: nova-conductor
     - env:
@@ -30,6 +19,8 @@ desiredState:
         value: novadbpassword
       - name: KEYSTONE_ADMIN_TOKEN
         value: ADMINTOKEN
+      - name: NEUTRON_SHARED_SECRET
+        value: sharedsecret
       image: kollaglue/fedora-rdo-nova-scheduler
       name: nova-scheduler
     - env:
@@ -39,6 +30,8 @@ desiredState:
         value: novadbpassword
       - name: KEYSTONE_ADMIN_TOKEN
         value: ADMINTOKEN
+      - name: NEUTRON_SHARED_SECRET
+        value: sharedsecret
       image: kollaglue/fedora-rdo-nova-api
       name: nova-api
     id: nova-1