diff options
| -rw-r--r-- | overcloud-source.yaml | 100 |
1 files changed, 86 insertions, 14 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index ecdf05c0..6949deaa 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -163,6 +163,10 @@ Parameters: Default: '' Description: If set, the public interface is a vlan with this device as the raw device. Type: String + 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. + Type: String controllerImage: Type: String Default: overcloud-control @@ -273,17 +277,32 @@ Resources: - show - 'novalocal' - Fn::Join: - - ' ' - - - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - Fn::GetAtt: - - controller0 - - networks - - {Ref: CloudName} - # If CloudName is unset, make the hosts line still valid - - unused + - "\n" + - Merge::Map: + controller0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - 'novalocal' + - {Ref: CloudName} NovaCompute0Passthrough: Type: OS::Heat::StructuredDeployment Properties: @@ -371,6 +390,8 @@ Resources: ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8 service-password: Ref: NeutronPassword + dnsmasq-options: + Ref: NeutronDnsmasqOptions ceilometer: db: mysql://ceilometer:unset@localhost/ceilometer metering_secret: {Ref: CeilometerMeteringSecret} @@ -450,9 +471,60 @@ Resources: - ':8000/v1/waitcondition' hosts: Fn::Join: - - ' ' - - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ controller0, networks ]}]]} - - {Ref: CloudName} + - "\n" + - - Fn::Join: + - "\n" + - Merge::Map: + NovaCompute0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - NovaCompute0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - NovaCompute0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - NovaCompute0 + - show + - 'novalocal' + - Fn::Join: + - "\n" + - Merge::Map: + controller0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - 'novalocal' + - {Ref: CloudName} controller0SSLDeployment: Type: OS::Heat::StructuredDeployment Properties: |