summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--overcloud-source.yaml5
-rw-r--r--setup.cfg1
-rw-r--r--undercloud-source.yaml5
3 files changed, 10 insertions, 1 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 8db9f856..7ea23e21 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -301,6 +301,10 @@ resources:
type: OS::Heat::RandomString
properties:
length: 10
+ MysqlRootPassword:
+ type: OS::Heat::RandomString
+ properties:
+ length: 10
PublicVirtualIP:
type: OS::Neutron::Port
properties:
@@ -490,6 +494,7 @@ resources:
mysql:
innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
local_bind: true
+ root-password: {get_resource: MysqlRootPassword}
nodes:
Merge::Map:
controller0:
diff --git a/setup.cfg b/setup.cfg
index 28adf7c2..f765a7dd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,5 @@
[metadata]
name = tripleo-heat-templates
-version = 0.0.1
summary = Heat templates for deploying OpenStack with OpenStack.
description-file =
README.md
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 19719dc5..a4adea08 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -194,6 +194,10 @@ resources:
length: 20
salt:
get_param: RabbitCookieSalt
+ MysqlRootPassword:
+ type: OS::Heat::RandomString
+ properties:
+ length: 10
undercloudConfig:
type: OS::Heat::StructuredConfig
properties:
@@ -276,6 +280,7 @@ resources:
signing_certificate: {get_param: KeystoneSigningCertificate}
mysql:
innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
+ root-password: {get_resource: MysqlRootPassword}
neutron:
host: 127.0.0.1
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8