diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-20 16:29:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-20 16:29:02 +0000 |
| commit | 6c537d2005b8cb5b25f63722376fca08471987ac (patch) | |
| tree | 0a45528088c74cd984ba2359738c52a30ecc7ffa /overcloud.yaml | |
| parent | 9b2281f8de84e730910342d40b12e37886203087 (diff) | |
| parent | 3b62761d2fc25abef4ca98e9d5863197c4497b85 (diff) | |
Merge "Add DefaultPasswords to composable services"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 06994278..a4f8fee1 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -384,6 +384,7 @@ resources: Services: {get_param: ControllerServices} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} EndpointMap: {get_attr: [EndpointMap, endpoint_map]} + DefaultPasswords: {get_attr: [DefaultPasswords, passwords]} Controller: type: OS::Heat::ResourceGroup @@ -422,6 +423,7 @@ resources: Services: {get_param: ComputeServices} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} EndpointMap: {get_attr: [EndpointMap, endpoint_map]} + DefaultPasswords: {get_attr: [DefaultPasswords, passwords]} Compute: type: OS::Heat::ResourceGroup @@ -455,6 +457,7 @@ resources: Services: {get_param: BlockStorageServices} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} EndpointMap: {get_attr: [EndpointMap, endpoint_map]} + DefaultPasswords: {get_attr: [DefaultPasswords, passwords]} BlockStorage: type: OS::Heat::ResourceGroup @@ -486,6 +489,7 @@ resources: Services: {get_param: ObjectStorageServices} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} EndpointMap: {get_attr: [EndpointMap, endpoint_map]} + DefaultPasswords: {get_attr: [DefaultPasswords, passwords]} ObjectStorage: type: OS::Heat::ResourceGroup @@ -518,6 +522,7 @@ resources: Services: {get_param: CephStorageServices} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} EndpointMap: {get_attr: [EndpointMap, endpoint_map]} + DefaultPasswords: {get_attr: [DefaultPasswords, passwords]} CephStorage: type: OS::Heat::ResourceGroup @@ -618,6 +623,16 @@ resources: length: 20 salt: {get_param: RabbitCookieSalt} + DefaultPasswords: + type: OS::TripleO::DefaultPasswords + properties: + DefaultMysqlRootPassword: {get_attr: [MysqlRootPassword, value]} + DefaultMysqlClusterPassword: {get_attr: [MysqlClusterUniquePart, value]} + DefaultRabbitCookie: {get_attr: [RabbitCookie, value]} + DefaultHeatAuthEncryptionKey: {get_attr: [HeatAuthEncryptionKey, value]} + DefaultPcsdPassword: {get_attr: [PcsdPassword, value]} + DefaultHorizonSecret: {get_attr: [HorizonSecret, value]} + # creates the network architecture Networks: type: OS::TripleO::Network |