From d65cd33bc0a1d67ed1cdcf40c18c5866b0720a8c Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 13 Sep 2013 10:25:49 +1200 Subject: Add in Neutron service password. The in-instance scripts are being fixed to not confuse the admin password with the neutron service password. Change-Id: I341574bb838a9563120791b9ac014d75274a96aa --- overcloud-source.yaml | 6 ++++++ undercloud-vm.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/overcloud-source.yaml b/overcloud-source.yaml index c20f81f9..0c1a5b15 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -18,6 +18,10 @@ Parameters: Default: default Description: Name of an existing EC2 KeyPair to enable SSH access to the instances Type: String + NeutronPassword: + Default: unset + Description: The password for the neutron service account, used by neutron agents. + Type: String NovaComputeDriver: Default: libvirt.LibvirtDriver Type: String @@ -195,6 +199,8 @@ Resources: physical_bridge: br-ex tenant_network_type: gre ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 + service-password: + Ref: NeutronPassword rabbit: host: Fn::GetAtt: diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index d2b4a4e4..e9f9b356 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -20,6 +20,10 @@ Parameters: Image: Default: undercloud Type: String + NeutronPassword: + Default: unset + Description: The password for the neutron service account, used by neutron agents. + Type: String PowerUserName: Default: stack Description: What username to ssh to the virtual power host with. @@ -135,6 +139,8 @@ Resources: bridge_mappings: ctlplane:br-ctlplane tenant_network_type: vlan enable_tunneling: 'False' + service-password: + Ref: NeutronPassword rabbit: host: 127.0.0.1 password: guest -- cgit 1.2.3-korg