Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add MongoDB as a Pacemaker resource when EnablePacemaker"
[apex-tripleo-heat-templates.git]
/
undercloud-source.yaml
diff --git
a/undercloud-source.yaml
b/undercloud-source.yaml
index
62775c0
..
ce5b7e8
100644
(file)
--- a/
undercloud-source.yaml
+++ b/
undercloud-source.yaml
@@
-74,9
+74,10
@@
parameters:
}
type: json
Flavor:
}
type: json
Flavor:
- default: baremetal
description: Flavor to request when deploying.
type: string
description: Flavor to request when deploying.
type: string
+ constraints:
+ - custom_constraint: nova.flavor
GlanceLogFile:
description: The filepath of the file to use for logging messages from Glance.
type: string
GlanceLogFile:
description: The filepath of the file to use for logging messages from Glance.
type: string
@@
-179,6
+180,9
@@
parameters:
description: The password for the nova service account, used by nova-api.
type: string
hidden: true
description: The password for the nova service account, used by nova-api.
type: string
hidden: true
+ NeutronDVR:
+ default: 'False'
+ type: string
NtpServer:
type: string
default: ''
NtpServer:
type: string
default: ''
@@
-306,11
+310,14
@@
resources:
mysql:
innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
root-password: {get_resource: MysqlRootPassword}
mysql:
innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
root-password: {get_resource: MysqlRootPassword}
+ bind_address: 127.0.0.1
neutron:
debug: {get_param: Debug}
host: 127.0.0.1
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
ovs:
neutron:
debug: {get_param: Debug}
host: 127.0.0.1
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
ovs:
+ local_ip:
+ get_input: controller_host
public_interface:
get_param: NeutronPublicInterface
public_interface_raw_device:
public_interface:
get_param: NeutronPublicInterface
public_interface_raw_device:
@@
-339,7
+346,7
@@
resources:
- value
ntp:
servers:
- value
ntp:
servers:
- - {server: {get_param: NtpServer}
, fudge: "stratum 0"
}
+ - {server: {get_param: NtpServer}}
undercloudPassthroughConfig:
type: OS::Heat::StructuredConfig
properties:
undercloudPassthroughConfig:
type: OS::Heat::StructuredConfig
properties: