diff options
| -rw-r--r-- | base.yaml | 18 | ||||
| -rw-r--r-- | block-storage-nfs.yaml | 6 | ||||
| -rw-r--r-- | block-storage.yaml | 4 | ||||
| -rw-r--r-- | controller.yaml | 12 | ||||
| -rw-r--r-- | examples/source_hot.yaml | 2 | ||||
| -rw-r--r-- | nagios3.yaml | 2 | ||||
| -rw-r--r-- | nfs-server-source.yaml | 4 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 1 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 5 | ||||
| -rw-r--r-- | overcloud-source.yaml | 113 | ||||
| -rw-r--r-- | ssl-source.yaml | 3 | ||||
| -rw-r--r-- | swift-deploy.yaml | 12 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 14 | ||||
| -rw-r--r-- | tripleo_heat_merge/merge.py | 2 | ||||
| -rw-r--r-- | undercloud-source.yaml | 8 |
15 files changed, 139 insertions, 67 deletions
@@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Tie OpenStack components together' parameters: TemplateRoot: @@ -12,7 +12,7 @@ resources: RabbitMQ: type: AWS::CloudFormation::Stack TemplateURL: - list_join: + Fn::Join: - {get_param: TemplateRoot} - rabbitmq.yaml parameters: @@ -22,7 +22,7 @@ resources: MySQL: type: AWS::CloudFormation::Stack TemplateURL: - list_join: + Fn::Join: - {get_param: TemplateRoot} - mysql.yaml parameters: @@ -32,14 +32,14 @@ resources: Keystone: type: AWS::CloudFormation::Stack TemplateURL: - list_join: + Fn::Join: - {get_param: TemplateRoot} - keystone.yaml parameters: AdminToken: {get_param: KeystoneAdminToken} KeyName: default KeystoneDSN: - list_join: + Fn::Join: - 'mysql://keystone:' - {get_attr: [ MySQL , KeystonePassword ]} - '@' @@ -48,13 +48,13 @@ resources: Glance: type: AWS::CloudFormation::Stack TemplateURL: - list_join: + Fn::Join: - {get_param: TemplateRoot} - glance.yaml parameters: KeyName: default HeatDSN: - list_join: + Fn::Join: - 'mysql://glance:' - {get_attr: [ MySQL, GlancePassword ] } - '@' @@ -63,13 +63,13 @@ resources: Heat: type: AWS::CloudFormation::Stack TemplateURL: - list_join: + Fn::Join: - {get_param: TemplateRoot} - heat.yaml parameters: KeyName: default HeatDSN: - list_join: + Fn::Join: - 'mysql://heat:' - {get_attr: [ MySQL, HeatPassword ] } - '@' diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml index 8346c1f6..49473167 100644 --- a/block-storage-nfs.yaml +++ b/block-storage-nfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Common Block Storage Configuration' parameters: BlockStorageImage: @@ -52,13 +52,13 @@ resources: keystone: host: {get_attr: [controller0, networks, ctlplane, 0]} cinder: - db: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [controller0, networks, ctlplane, 0]} , '/cinder']]} + db: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} volume_size_mb: '5000' service-password: get_param: CinderPassword include_nfs_backend: 'true' nfs_shares: - - {list_join: ['', [{get_attr: [controller0, networks, ctlplane, 0]} , ':/mnt/state/var/lib/nfs_share']]} + - {"Fn::Join": ['', [{get_attr: [controller0, networks, ctlplane, 0]} , ':/mnt/state/var/lib/nfs_share']]} admin-password: {get_param: AdminPassword} rabbit: host: {get_attr: [controller0, networks, ctlplane, 0]} diff --git a/block-storage.yaml b/block-storage.yaml index 761de523..22811d37 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Common Block Storage Configuration' parameters: BlockStorageImage: @@ -30,7 +30,7 @@ resources: config: {get_resource: BlockStorageConfig} input_values: controller_host: {get_attr: [controller0, networks, ctlplane, 0]} - cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [controller0, networks, ctlplane, 0]} , '/cinder']]} + cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} neutron_local_ip: {get_attr: [BlockStorage0 , networks, ctlplane, 0]} signal_transport: NO_SIGNAL BlockStorageConfig: diff --git a/controller.yaml b/controller.yaml index 1b0cb541..8aac819f 100644 --- a/controller.yaml +++ b/controller.yaml @@ -1,6 +1,6 @@ description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL server,Dedicated RabbitMQ Server -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 parameters: AdminToken: type: string @@ -130,7 +130,7 @@ resources: password: {get_param: NeutronDBPassword} glance: db: - list_join: + Fn::Join: - '' - - 'mysql://glance:' - {get_param: GlanceDBPassword} @@ -141,7 +141,7 @@ resources: get_param: GlanceLogFile heat: db: - list_join: + Fn::Join: - '' - - 'mysql://heat:' - {get_param: HeatDBPassword} @@ -168,14 +168,14 @@ resources: host: '127.0.0.1' db: - list_join: + Fn::Join: - '' - - 'mysql://keystone:' - {get_param: KeystoneDBPassword} - '@127.0.0.1/keystone' nova: db: - list_join: + Fn::Join: - '' - - 'mysql://nova:' - {get_param: NovaDBPassword} @@ -184,7 +184,7 @@ resources: host: '127.0.0.1' ovs_db: - list_join: + Fn::Join: - '' - - 'mysql://neutron:' - {get_param: NeutronDBPassword} diff --git a/examples/source_hot.yaml b/examples/source_hot.yaml index 7b47f2b5..15314886 100644 --- a/examples/source_hot.yaml +++ b/examples/source_hot.yaml @@ -13,4 +13,4 @@ resources: Path: examples/lib_hot.yaml SubKey: resources.GenericB parameters: - ImportantValue: {list_join: [ '', ['one', 'two', 'three']]} + ImportantValue: {"Fn::Join": [ '', ['one', 'two', 'three']]} diff --git a/nagios3.yaml b/nagios3.yaml index 06cbb6a2..1e0a4615 100644 --- a/nagios3.yaml +++ b/nagios3.yaml @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. # -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: Deploy Nagios parameters: adm_web_passwd: diff --git a/nfs-server-source.yaml b/nfs-server-source.yaml index 63a15020..8e32e963 100644 --- a/nfs-server-source.yaml +++ b/nfs-server-source.yaml @@ -7,7 +7,7 @@ resources: shares: Merge::Map: NovaCompute0: - list_join: + Fn::Join: - ' ' - - get_attr: - NovaCompute0 @@ -15,7 +15,7 @@ resources: - ctlplane - 0 BlockStorage0: - list_join: + Fn::Join: - ' ' - - get_attr: - BlockStorage0 diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index ef440a3d..cb428ea6 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -40,6 +40,7 @@ resources: service-password: {get_input: neutron_password} admin-password: {get_input: admin_password} rabbit: + host: {get_input: rabbit_host} username: {get_input: rabbit_username} password: {get_input: rabbit_password} live-update: diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 597b42b2..c5f4337c 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Nova Compute' parameters: AdminPassword: @@ -77,6 +77,8 @@ parameters: default: '' description: A port to add to the NeutronPhysicalBridge. type: string + RabbitHost: + type: string RabbitUserName: type: string RabbitPassword: @@ -216,6 +218,7 @@ resources: neutron_public_interface: {get_param: NeutronPublicInterface} neutron_password: {get_param: NeutronPassword} admin_password: {get_param: AdminPassword} + rabbit_host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} live_update_host: {get_param: LiveUpdateHost} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index fcfb821f..6432baa4 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -1,6 +1,6 @@ description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL server,Dedicated RabbitMQ Server,Group of Nova Computes -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 parameters: AdminPassword: default: unset @@ -317,9 +317,25 @@ resources: KeystoneHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} NeutronHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - NovaDSN: {list_join: ['', ['mysql://nova:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/nova']]} - CeilometerDSN: {list_join: ['', ['mysql://ceilometer:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/ceilometer']]} - NeutronDSN: {list_join: ['', ['mysql://neutron:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/ovs_neutron']]} + RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} + NovaDSN: + Fn::Join: + - '' + - - mysql://nova:unset@ + - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} + - /nova + CeilometerDSN: + Fn::Join: + - '' + - - mysql://ceilometer:unset@ + - *compute_database_host + - /ceilometer + NeutronDSN: + Fn::Join: + - '' + - - mysql://neutron:unset@ + - *compute_database_host + - /ovs_neutron NeutronNetworkType: "gre" NeutronEnableTunnelling: "True" NeutronFlatNetworks: @@ -373,8 +389,16 @@ resources: - controller0 - show nodeid: {get_input: bootstack_nodeid} + database: + host: &database_host + {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} cinder: - db: mysql://cinder:unset@localhost/cinder + db: + Fn::Join: + - '' + - - mysql://cinder:unset@ + - *database_host + - /cinder volume_size_mb: get_param: CinderLVMLoopDeviceSize service-password: @@ -399,7 +423,12 @@ resources: registry: host: {get_input: controller_virtual_ip} backend: swift - db: mysql://glance:unset@localhost/glance + db: + Fn::Join: + - '' + - - mysql://glance:unset@ + - *database_host + - /glance host: get_input: controller_virtual_ip port: @@ -421,7 +450,12 @@ resources: admin_tenant_name: service admin_user: heat auth_encryption_key: unset___________ - db: mysql://heat:unset@localhost/heat + db: + Fn::Join: + - '' + - - mysql://heat:unset@ + - *database_host + - /heat stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword} watch_server_url: {get_input: heat.watch_server_url} metadata_server_url: {get_input: heat.metadata_server_url} @@ -434,7 +468,12 @@ resources: controller0: {get_attr: [controller0, show, name]} keystone: - db: mysql://keystone:unset@localhost/keystone + db: + Fn::Join: + - '' + - - mysql://keystone:unset@ + - *database_host + - /keystone host: get_input: controller_virtual_ip ca_certificate: {get_param: KeystoneCACertificate} @@ -442,12 +481,13 @@ resources: signing_certificate: {get_param: KeystoneSigningCertificate} mysql: innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} + local_bind: true nodes: Merge::Map: controller0: ip: {get_attr: [controller0, networks, ctlplane, 0]} cluster_name: - list_join: + Fn::Join: - '-' - - 'tripleo' - {get_resource: MysqlClusterUniquePart} @@ -468,13 +508,23 @@ resources: get_param: NeutronPublicInterfaceDefaultRoute physical_bridge: br-ex tenant_network_type: gre - ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 + ovs_db: + Fn::Join: + - '' + - - mysql://neutron:unset@ + - *database_host + - /ovs_neutron?charset=utf8 service-password: get_param: NeutronPassword dnsmasq-options: get_param: NeutronDnsmasqOptions ceilometer: - db: mysql://ceilometer:unset@localhost/ceilometer + db: + Fn::Join: + - '' + - - mysql://ceilometer:unset@ + - *database_host + - /ceilometer metering_secret: {get_param: CeilometerMeteringSecret} service-password: get_param: CeilometerPassword @@ -486,7 +536,12 @@ resources: get_param: SnmpdReadonlyUserPassword nova: compute_driver: libvirt.LibvirtDriver - db: mysql://nova:unset@localhost/nova + db: + Fn::Join: + - '' + - - mysql://nova:unset@ + - *database_host + - /nova default_floating_pool: ext-net host: {get_input: controller_virtual_ip} @@ -494,6 +549,7 @@ resources: service-password: get_param: NovaPassword rabbit: + host: {get_input: controller_virtual_ip} username: get_param: RabbitUserName password: @@ -584,6 +640,10 @@ resources: - name: heat_cfn port: 8000 net_binds: *public_binds + - name: mysql + port: 3306 + extra_server_params: + - backup - name: nova_ec2 port: 8773 - name: nova_osapi @@ -598,6 +658,11 @@ resources: - name: swift_proxy_server port: 8080 net_binds: *public_binds + - name: rabbitmq + port: 5672 + options: + - timeout client 0 + - timeout server 0 controllerPassthrough: type: OS::Heat::StructuredConfig properties: @@ -635,19 +700,19 @@ resources: controller_virtual_ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} heat.watch_server_url: - list_join: + Fn::Join: - '' - - 'http://' - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - ':8003' heat.metadata_server_url: - list_join: + Fn::Join: - '' - - 'http://' - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - ':8000' heat.waitcondition_server_url: - list_join: + Fn::Join: - '' - - 'http://' - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} @@ -658,36 +723,36 @@ resources: config: completion-signal: {get_input: deploy_signal_id} hosts: - list_join: + Fn::Join: - "\n" - - - list_join: + - - Fn::Join: - "\n" - Merge::Map: NovaCompute0: - list_join: + Fn::Join: - ' ' - - {get_attr: [NovaCompute0, networks, ctlplane, 0]} - {get_attr: [NovaCompute0, show, name]} - - list_join: + - Fn::Join: - '.' - - {get_attr: [NovaCompute0, show, name]} - 'novalocal' - - list_join: + - Fn::Join: - "\n" - Merge::Map: controller0: - list_join: + Fn::Join: - ' ' - - {get_attr: [controller0, networks, ctlplane, 0]} - {get_attr: [controller0, show, name]} - - list_join: + - Fn::Join: - '.' - - {get_attr: [controller0, show, name]} - 'novalocal' - {get_param: CloudName} rabbit: nodes: - list_join: + Fn::Join: - ',' - Merge::Map: controller0: @@ -715,7 +780,7 @@ outputs: KeystoneURL: description: URL for the Overcloud Keystone service value: - list_join: + Fn::Join: - '' - - http:// - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} diff --git a/ssl-source.yaml b/ssl-source.yaml index 09ea52a2..ac1ef42d 100644 --- a/ssl-source.yaml +++ b/ssl-source.yaml @@ -20,6 +20,9 @@ resources: properties: group: os-apply-config config: + ssl: + ca_certificate: + get_input: ssl_ca_certificate stunnel: cert: get_input: ssl_certificate diff --git a/swift-deploy.yaml b/swift-deploy.yaml index eaa01317..239a4d48 100644 --- a/swift-deploy.yaml +++ b/swift-deploy.yaml @@ -21,29 +21,29 @@ resources: swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} swift_devices: - list_join: + Fn::Join: - ', ' - Merge::Map: controller0: - list_join: + Fn::Join: - '' - - 'r1z1-' - {get_attr: [controller0, networks, ctlplane, 0]} - ':%PORT%/d1' SwiftStorage0: - list_join: + Fn::Join: - '' - - 'r1z1-' - {get_attr: [SwiftStorage0, networks, ctlplane, 0]} - ':%PORT%/d1' swift_proxy_memcache: - list_join: + Fn::Join: - ',' - Merge::Map: controller0: - list_join: + Fn::Join: - ', ' - - - list_join: + - - Fn::Join: - '' - - {get_attr: [controller0, networks, ctlplane, 0]} - ':11211' diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index fbedb0bf..3dbdda95 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 description: 'Common Swift Storage Configuration' parameters: SwiftStorageImage: @@ -49,29 +49,29 @@ resources: swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} swift_devices: - list_join: + Fn::Join: - ', ' - Merge::Map: controller0: - list_join: + Fn::Join: - '' - - 'r1z1-' - {get_attr: [controller0, networks, ctlplane, 0]} - ':%PORT%/d1' SwiftStorage0: - list_join: + Fn::Join: - '' - - 'r1z1-' - {get_attr: [SwiftStorage0, networks, ctlplane, 0]} - ':%PORT%/d1' swift_proxy_memcache: - list_join: + Fn::Join: - ',' - Merge::Map: controller0: - list_join: + Fn::Join: - ', ' - - - list_join: + - - Fn::Join: - '' - - {get_attr: [controller0, networks, ctlplane, 0]} - ':11211' diff --git a/tripleo_heat_merge/merge.py b/tripleo_heat_merge/merge.py index c83f3af1..49aee6f2 100644 --- a/tripleo_heat_merge/merge.py +++ b/tripleo_heat_merge/merge.py @@ -26,7 +26,7 @@ class Cfn(object): class Hot(object): base_template = { - 'heat_template_version': '2014-10-16', + 'heat_template_version': '2013-05-23', 'description': [] } get_resource = 'get_resource' diff --git a/undercloud-source.yaml b/undercloud-source.yaml index ef8d7cd4..741d3ae2 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -1,5 +1,5 @@ description: All-in-one baremetal OpenStack and all dependencies. -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 parameters: AdminPassword: default: unset @@ -337,19 +337,19 @@ resources: - ctlplane - 0 heat.watch_server_url: - list_join: + Fn::Join: - '' - - 'http://' - get_attr: [undercloud, networks, ctlplane, 0] - ':8003' heat.metadata_server_url: - list_join: + Fn::Join: - '' - - 'http://' - {get_attr: [undercloud, networks, ctlplane, 0]} - ':8000' heat.waitcondition_server_url: - list_join: + Fn::Join: - '' - - 'http://' - {get_attr: [undercloud, networks, ctlplane, 0]} |