diff options
| -rw-r--r-- | nova-compute-config.yaml | 2 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 11 | ||||
| -rw-r--r-- | overcloud-source.yaml | 52 | ||||
| -rw-r--r-- | overcloud-vlan-port.yaml | 2 | ||||
| -rw-r--r-- | swift-deploy.yaml | 5 | ||||
| -rw-r--r-- | swift-source.yaml | 2 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 1 | ||||
| -rw-r--r-- | tripleo_heat_merge/merge.py | 7 | ||||
| -rw-r--r-- | undercloud-source.yaml | 11 | ||||
| -rw-r--r-- | undercloud-vm-ironic-deploy.yaml | 4 |
10 files changed, 64 insertions, 33 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 5dc8f204..63685df6 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -38,6 +38,7 @@ resources: ovs: local_ip: {get_input: neutron_local_ip} tenant_network_type: {get_input: neutron_tenant_network_type} + tunnel_types: {get_input: neutron_tunnel_types} network_vlan_ranges: {get_input: neutron_network_vlan_ranges} bridge_mappings: {get_input: neutron_bridge_mappings} enable_tunneling: {get_input: neutron_enable_tunneling} @@ -56,7 +57,6 @@ resources: tenant-name: {get_input: live_update_tenant_name} base_image_id: {get_input: nova_image} live_update_image_id: {get_input: live_update_compute_image} - completion-signal: {get_input: deploy_signal_id} ntp: servers: - {server: {get_input: ntp_server}, fudge: "stratum 0"} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index d368f14b..5b54a540 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -84,6 +84,16 @@ parameters: default: '' description: A port to add to the NeutronPhysicalBridge. type: string + NeutronNetworkType: + default: 'gre' + description: The tenant network type for Neutron, either gre or vxlan. + type: string + NeutronTunnelTypes: + default: 'gre' + description: | + The tunnel types for the Neutron tenant network. To specify multiple + values, use a comma separated string, like so: 'gre,vxlan' + type: string RabbitHost: type: string RabbitUserName: @@ -227,6 +237,7 @@ resources: neutron_dsn: {get_param: NeutronDSN} neutron_local_ip: {get_attr: [NovaCompute0, networks, ctlplane, 0]} neutron_tenant_network_type: {get_param: NeutronNetworkType} + neutron_tunnel_types: {get_param: NeutronTunnelTypes} neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges} neutron_bridge_mappings: {get_param: NeutronBridgeMappings} neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 3dbd5712..947becfb 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -235,7 +235,17 @@ parameters: description: Neutron ID for ctlplane network. NeutronDnsmasqOptions: default: 'dhcp-option-force=26,1400' - description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead. + description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the tunnel overhead. + type: string + NeutronNetworkType: + default: 'gre' + description: The tenant network type for Neutron, either gre or vxlan. + type: string + NeutronTunnelTypes: + default: 'gre' + description: | + The tunnel types for the Neutron tenant network. To specify multiple + values, use a comma separated string, like so: 'gre,vxlan' type: string controllerImage: type: string @@ -393,7 +403,10 @@ resources: - - mysql://neutron:unset@ - *compute_database_host - /ovs_neutron - NeutronNetworkType: "gre" + NeutronNetworkType: + get_param: NeutronNetworkType + NeutronTunnelTypes: + get_param: NeutronTunnelTypes NeutronEnableTunnelling: "True" NeutronFlatNetworks: get_param: NeutronFlatNetworks @@ -447,11 +460,9 @@ resources: - 0 - Merge::Map: controller0: - - Fn::Select: + - get_attr: + - controller0 - name - - get_attr: - - controller0 - - show nodeid: {get_input: bootstack_nodeid} database: host: &database_host @@ -533,7 +544,7 @@ resources: nodes: Merge::Map: controller0: - {get_attr: [controller0, show, name]} + {get_attr: [controller0, name]} keystone: db: Fn::Join: @@ -580,7 +591,10 @@ resources: public_interface_tag: get_param: NeutronPublicInterfaceTag physical_bridge: br-ex - tenant_network_type: gre + tenant_network_type: + get_param: NeutronNetworkType + tunnel_types: + get_param: NeutronTunnelTypes ovs_db: Fn::Join: - '' @@ -678,7 +692,7 @@ resources: Merge::Map: controller0: ip: {get_attr: [controller0, networks, ctlplane, 0]} - name: {get_attr: [controller0, show, name]} + name: {get_attr: [controller0, name]} net_binds: - ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} services: @@ -778,7 +792,7 @@ resources: config: {get_resource: controllerConfig} server: {get_resource: controller0} input_values: - bootstack_nodeid: {get_attr: [controller0, show, name]} + bootstack_nodeid: {get_attr: [controller0, name]} controller_host: {get_attr: [controller0, networks, ctlplane, 0]} controller_virtual_ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} @@ -815,10 +829,10 @@ resources: Fn::Join: - ' ' - - {get_attr: [NovaCompute0, networks, ctlplane, 0]} - - {get_attr: [NovaCompute0, show, name]} + - {get_attr: [NovaCompute0, name]} - Fn::Join: - '.' - - - {get_attr: [NovaCompute0, show, name]} + - - {get_attr: [NovaCompute0, name]} - 'novalocal' - Fn::Join: - "\n" @@ -827,10 +841,10 @@ resources: Fn::Join: - ' ' - - {get_attr: [BlockStorage0, networks, ctlplane, 0]} - - {get_attr: [BlockStorage0, show, name]} + - {get_attr: [BlockStorage0, name]} - Fn::Join: - '.' - - - {get_attr: [BlockStorage0, show, name]} + - - {get_attr: [BlockStorage0, name]} - 'novalocal' - Fn::Join: - "\n" @@ -839,10 +853,10 @@ resources: Fn::Join: - ' ' - - {get_attr: [SwiftStorage0, networks, ctlplane, 0]} - - {get_attr: [SwiftStorage0, show, name]} + - {get_attr: [SwiftStorage0, name]} - Fn::Join: - '.' - - - {get_attr: [SwiftStorage0, show, name]} + - - {get_attr: [SwiftStorage0, name]} - 'novalocal' - Fn::Join: - "\n" @@ -851,10 +865,10 @@ resources: Fn::Join: - ' ' - - {get_attr: [controller0, networks, ctlplane, 0]} - - {get_attr: [controller0, show, name]} + - {get_attr: [controller0, name]} - Fn::Join: - '.' - - - {get_attr: [controller0, show, name]} + - - {get_attr: [controller0, name]} - 'novalocal' - {get_param: CloudName} rabbit: @@ -863,7 +877,7 @@ resources: - ',' - Merge::Map: controller0: - {get_attr: [controller0, show, name]} + {get_attr: [controller0, name]} controller0SSLDeployment: type: OS::Heat::StructuredDeployment properties: diff --git a/overcloud-vlan-port.yaml b/overcloud-vlan-port.yaml index e962e7a0..71b444fb 100644 --- a/overcloud-vlan-port.yaml +++ b/overcloud-vlan-port.yaml @@ -1,7 +1,7 @@ outputs: controller0PublicIP: description: Address for registering endpoints in the cloud. - value: {get_attr: [controller0VLANPort, fixed_ips, 0, ip_address]} + value: {get_attr: [controller0_VLANPort, fixed_ips, 0, ip_address]} resources: # Override the main template which can also supply a static route. controller0_99_VLANPort: diff --git a/swift-deploy.yaml b/swift-deploy.yaml index 4a8625ee..803861ee 100644 --- a/swift-deploy.yaml +++ b/swift-deploy.yaml @@ -10,6 +10,10 @@ parameters: description: The password for the swift service account, used by the swift proxy services. type: string hidden: true + SwiftPartPower: + default: 10 + description: Partition Power to use when building Swift rings + type: number SwiftReplicas: type: number default: 1 @@ -28,6 +32,7 @@ resources: input_values: swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} + swift_part_power: {get_param: SwiftPartPower} swift_devices: Fn::Join: - ', ' diff --git a/swift-source.yaml b/swift-source.yaml index b07164c8..815ca7f5 100644 --- a/swift-source.yaml +++ b/swift-source.yaml @@ -7,7 +7,7 @@ resources: swift: devices: { get_input: swift_devices } hash: { get_input: swift_hash_suffix } - part-power: 10 + part-power: { get_input: swift_part_power } proxy-memcache: { get_input: swift_proxy_memcache } replicas: {get_input: swift_replicas } min-part-hours: {get_input: swift_min_part_hours } diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index d3653426..31addaff 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -43,6 +43,7 @@ resources: input_values: swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} + swift_part_power: {get_param: SwiftPartPower} swift_devices: Fn::Join: - ', ' diff --git a/tripleo_heat_merge/merge.py b/tripleo_heat_merge/merge.py index 49aee6f2..b5bec0f4 100644 --- a/tripleo_heat_merge/merge.py +++ b/tripleo_heat_merge/merge.py @@ -332,6 +332,9 @@ def merge(templates, master_role=None, slave_roles=None, # XXX Assuming ImageId is always a Ref ikey_val = end_template[lang.parameters][rbody[lang.properties][image_key][lang.get_param]] del end_template[lang.parameters][rbody[lang.properties][image_key][lang.get_param]] + if 'OpenStack::Role' in rbody.get(lang.metadata, {}): + sys.stderr.write("WARNING: OpenStack::Role is deprecated" + " and will be removed in a later release\n"); role = rbody.get(lang.metadata, {}).get('OpenStack::Role', r) role = translate_role(role, master_role, slave_roles) if role != r: @@ -342,6 +345,10 @@ def merge(templates, master_role=None, slave_roles=None, if m in end_template[lang.resources][role].get(lang.metadata, {}): if m == 'OpenStack::ImageBuilder::Elements': end_template[lang.resources][role][lang.metadata][m].extend(mbody) + sys.stderr.write( + "WARNING: OpenStack::ImageBuilder::Elements" + " is deprecated and will be removed in a" + " later release\n"); continue if mbody != end_template[lang.resources][role][lang.metadata][m]: errors.append('Role %s metadata key %s conflicts.' % diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 0788e8b6..8f041f98 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -11,10 +11,6 @@ parameters: description: The keystone auth secret. type: string hidden: true - CinderLVMLoopDeviceSize: - default: 5000 - description: The size of the loopback file used by the cinder LVM driver. - type: number BaremetalArch: default: i386 description: The architecture to use in Nova-BM - i386 or amd64. @@ -230,11 +226,9 @@ resources: - 0 - Merge::Map: undercloud: - - Fn::Select: + - get_attr: + - undercloud - name - - get_attr: - - undercloud - - show nodeid: {get_input: bootstack_nodeid} bootstack: public_interface_ip: @@ -363,7 +357,6 @@ resources: bootstack_nodeid: get_attr: - undercloud - - show - name controller_host: get_attr: diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml index f1d3af78..3bf32a76 100644 --- a/undercloud-vm-ironic-deploy.yaml +++ b/undercloud-vm-ironic-deploy.yaml @@ -8,7 +8,7 @@ parameters: description: What interface to bridge onto br-ex for network nodes. type: string NovaComputeDriver: - default: ironic.nova.virt.ironic.driver.IronicDriver + default: nova.virt.ironic.driver.IronicDriver description: Full class name for the Nova compute driver type: string NovaComputeManager: @@ -16,7 +16,7 @@ parameters: description: Full class name for the Nova compute manager type: string NovaSchedulerHostManager: - default: ironic.nova.scheduler.ironic_host_manager.IronicHostManager + default: nova.scheduler.ironic_host_manager.IronicHostManager description: Full class name for the Nova scheduler host manager type: string PowerSSHPrivateKey: |