diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-04-18 10:27:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-04-18 10:27:47 +0000 |
| commit | 5f74f5a5f84577446224c9f2c90c3a045e6a272d (patch) | |
| tree | 966e0b81839d8b16fc680b32df8798761f513b98 | |
| parent | be5af1a35e6bbb9e517fd953a5fe0e2467676b91 (diff) | |
| parent | bbf98eb05368161c578071166c510d9f1070f3c2 (diff) | |
Merge "Adding undercloud ceilometer"
| -rw-r--r-- | undercloud-source.yaml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml index c05d5f7d..9eaa8786 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -15,6 +15,16 @@ Parameters: Default: i386 Description: The architecture to use in Nova-BM - i386 or amd64. Type: String + CeilometerMeteringSecret: + Default: unset + Description: Secret shared by the ceilometer services. + Type: String + NoEcho: true + CeilometerPassword: + Default: unset + Description: The password for the ceilometer service account. + Type: String + NoEcho: true Flavor: Default: baremetal Description: Flavor to request when deploying. @@ -126,7 +136,7 @@ Resources: OpenStack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ] admin-password: Ref: AdminPassword - admin-token: + admin-token: Ref: AdminToken controller-address: Fn::Select: @@ -136,6 +146,11 @@ Resources: - Fn::GetAtt: - undercloud - networks + ceilometer: + db: mysql://ceilometer:unset@localhost/ceilometer + metering_secret: {Ref: CeilometerMeteringSecret} + service-password: + Ref: CeilometerPassword cinder: db: mysql://cinder:unset@localhost/cinder volume_size_mb: '5000' |