From eadb34841f7b56b8c778800aabd8c41ff665153a Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Fri, 13 Sep 2013 19:02:30 +1200
Subject: Add Nova service password.

Another service converted to match the keystone model of unique
accounts per service.

Change-Id: I62fce289a7032138be3aca8c74df499c2b1fde28
---
 nova-compute-instance.yaml | 6 ++++++
 overcloud-source.yaml      | 6 ++++++
 undercloud-vm.yaml         | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 3a29f011..b461d971 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -34,6 +34,10 @@ Parameters:
     Default: ''
   NovaApiHost:
     Type: String
+  NovaPassword:
+    Default: unset
+    Description: The password for the nova service account, used by nova-api.
+    Type: String
   GlanceHost:
     Type: String
   NovaDSN:
@@ -98,6 +102,8 @@ Resources:
         compute_libvirt_type: {Ref: NovaComputeLibvirtType}
         db: {Ref: NovaDSN}
         host: {Ref: NovaApiHost}
+        service-password:
+          Ref: NovaPassword
       glance:
         host: {Ref: GlanceHost}
       keystone:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 8800aca8..2505ba21 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -42,6 +42,10 @@ Parameters:
   NovaInterfaces:
     Default: eth0
     Type: String
+  NovaPassword:
+    Default: unset
+    Description: The password for the nova service account, used by nova-api.
+    Type: String
   PowerUserName:
     Default: stack
     Description: What username to ssh to the virtual power host with.
@@ -195,6 +199,8 @@ Resources:
             - notcompute
             - PrivateIp
         metadata-proxy: true
+        service-password:
+          Ref: NovaPassword
       neutron:
         host:
           Fn::GetAtt:
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index efd3b02f..7941b0da 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -28,6 +28,10 @@ Parameters:
     Default: unset
     Description: The password for the neutron service account, used by neutron agents.
     Type: String
+  NovaPassword:
+    Default: unset
+    Description: The password for the nova service account, used by nova-api.
+    Type: String
   PowerUserName:
     Default: stack
     Description: What username to ssh to the virtual power host with.
@@ -133,6 +137,8 @@ Resources:
             key: /opt/stack/boot-stack/virtual-power-key
             ssh_host: 192.168.122.1
             type: virsh
+        service-password:
+          Ref: NovaPassword
       neutron:
         host: 127.0.0.1
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
-- 
cgit 1.2.3-korg