diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-26 23:59:05 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-26 23:59:05 +0000 |
commit | 8c778263a82197d640358fc28e59a4ef524c0261 (patch) | |
tree | bc0d54081363b90c4be90dfc7df8de528f0ff8b9 /overcloud.j2.yaml | |
parent | 5dc466725ba47b4d78e2b5869d4df470f262a281 (diff) | |
parent | 562ee3a9a74a06d080847193b017cbe9e59d7077 (diff) |
Merge "Add split-stack environments"
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r-- | overcloud.j2.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 3cecac14..b2aa08c1 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -242,15 +242,15 @@ resources: HOST: {get_param: CloudNameStorageManagement} HeatAuthEncryptionKey: - type: OS::Heat::RandomString + type: OS::TripleO::RandomString PcsdPassword: - type: OS::Heat::RandomString + type: OS::TripleO::RandomString properties: length: 16 HorizonSecret: - type: OS::Heat::RandomString + type: OS::TripleO::RandomString properties: length: 10 @@ -334,7 +334,7 @@ resources: servers: {get_attr: [{{role.name}}Servers, value]} {{role.name}}AllNodesDeployment: - type: OS::Heat::StructuredDeployments + type: OS::TripleO::AllNodesDeployment depends_on: {% for role_inner in roles %} - {{role_inner.name}}HostsDeployment @@ -575,12 +575,12 @@ resources: UpdateIdentifier: {get_param: UpdateIdentifier} MysqlRootPassword: - type: OS::Heat::RandomString + type: OS::TripleO::RandomString properties: length: 10 RabbitCookie: - type: OS::Heat::RandomString + type: OS::TripleO::RandomString properties: length: 20 salt: {get_param: RabbitCookieSalt} |