summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-10-16 11:15:33 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-10-16 11:51:46 -0400
commit558dcb5f56cf52a949fecc580ef1e359a1c6cb30 (patch)
tree1e45c8afb328211e8cd4d6c1f3ac452449a95caa
parentc3c41964f01f86b13c751f31845cf9e025a00aa3 (diff)
downloadkolla-558dcb5f56cf52a949fecc580ef1e359a1c6cb30.tar.gz
kolla-558dcb5f56cf52a949fecc580ef1e359a1c6cb30.zip
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
-rw-r--r--k8s/pod/nova-controller-pod.yaml19
1 files changed, 6 insertions, 13 deletions
diff --git a/k8s/pod/nova-controller-pod.yaml b/k8s/pod/nova-controller-pod.yaml
index 9e7582698..3b432bb6a 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