diff options
-rw-r--r-- | nova-compute-config.yaml | 3 | ||||
-rw-r--r-- | nova-compute-instance.yaml | 4 | ||||
-rw-r--r-- | overcloud-source.yaml | 49 | ||||
-rw-r--r-- | swift-deploy.yaml | 22 | ||||
-rw-r--r-- | swift-source.yaml | 1 | ||||
-rw-r--r-- | swift-storage-source.yaml | 45 | ||||
-rw-r--r-- | undercloud-source.yaml | 19 |
7 files changed, 116 insertions, 27 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 4d672f66..ebc8fbd2 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -50,6 +50,9 @@ Resources: 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"} NovaComputePassthrough: Type: OS::Heat::StructuredConfig Properties: diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index fe04ee4a..8cbf7759 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -58,6 +58,9 @@ Parameters: NovaImage: Type: String Default: overcloud-compute + NtpServer: + Type: String + Default: '' KeystoneHost: Type: String NeutronFlatNetworks: @@ -211,6 +214,7 @@ Resources: live_update_tenant_name: {Ref: LiveUpdateTenantName} nova_image: {Ref: NovaImage} live_update_image_id: {Ref: LiveUpdateComputeImage} + ntp_server: {Ref: NtpServer} NovaCompute0Passthrough: Type: OS::Heat::StructuredDeployment Properties: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index f3bf1540..d730996e 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -263,14 +263,14 @@ Resources: Path: nova-compute-instance.yaml SubKey: Resources.NovaCompute0Deploy Parameters: - NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/nova']]} - CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/ceilometer']]} - NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ]}, '/neutron']]} + NovaApiHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} + KeystoneHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} + RabbitHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} + NeutronHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} + GlanceHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} + NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/nova']]} + CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/ceilometer']]} + NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/neutron']]} NeutronNetworkType: "gre" NeutronEnableTunnelling: "True" NeutronFlatNetworks: @@ -361,8 +361,21 @@ Resources: admin-token: Ref: AdminToken bootstack: + bootstrap_nodeid: + Fn::Select: + - 0 + - Fn::Select: + - 0 + - Merge::Map: + controller0: + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show public_interface_ip: Ref: NeutronPublicInterfaceIP + nodeid: {get_input: bootstack_nodeid} cinder: db: mysql://cinder:unset@localhost/cinder volume_size_mb: @@ -496,6 +509,12 @@ Resources: config: {Ref: controllerConfig} server: {Ref: controller0} input_values: + bootstack_nodeid: + Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show controller_host: Fn::Select: - 0 @@ -508,19 +527,19 @@ Resources: Fn::Join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ controller0, networks ]}]]} + - {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} - ':8003' heat.metadata_server_url: Fn::Join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ controller0, networks ]}]]} + - {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} - ':8000' heat.waitcondition_server_url: Fn::Join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ controller0, networks ]}]]} + - {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} - ':8000/v1/waitcondition' hosts: Fn::Join: @@ -604,10 +623,10 @@ Outputs: - '' - - http:// - Fn::Select: - - 0 + - ip_address - Fn::Select: - - ctlplane + - 0 - Fn::GetAtt: - - controller0 - - networks + - ControlVirtualIP + - fixed_ips - :5000/v2.0/ diff --git a/swift-deploy.yaml b/swift-deploy.yaml index 1e96928f..3fe8eced 100644 --- a/swift-deploy.yaml +++ b/swift-deploy.yaml @@ -43,3 +43,25 @@ Resources: - SwiftStorage0 - networks - ':%PORT%/d1' + swift_proxy_memcache: + Fn::Join: + - ', ' + - - Fn::Join: + - '' + - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + - ':11211' + - Fn::Join: + - ', ' + - Merge::Map: + SwiftStorage0: + Fn::Join: + - '' + - - Fn::Select: + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - SwiftStorage0 + - networks + - ':11211' + diff --git a/swift-source.yaml b/swift-source.yaml index aee81c26..3ca2b1a8 100644 --- a/swift-source.yaml +++ b/swift-source.yaml @@ -8,6 +8,7 @@ Resources: devices: { get_input: swift_devices } hash: { get_input: swift_hash_suffix } part-power: 10 + proxy-memcache: { get_input: swift_proxy_memcache } replicas: 1 service-password: { get_input: swift_password } neutron: diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 69236b28..f20b2752 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -39,16 +39,37 @@ Resources: - ':%PORT%/d1' - Fn::Join: - ', ' - Merge::Map: - SwiftStorage0: - Fn::Join: - - '' - - - 'r1z1-' - - Fn::Select: - - 0 + - Merge::Map: + SwiftStorage0: + Fn::Join: + - '' + - - 'r1z1-' - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - SwiftStorage0 - - networks - - ':%PORT%/d1' + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - SwiftStorage0 + - networks + - ':%PORT%/d1' + swift_proxy_memcache: + Fn::Join: + - ', ' + - - Fn::Join: + - '' + - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + - ':11211' + - Fn::Join: + - ', ' + - Merge::Map: + SwiftStorage0: + Fn::Join: + - '' + - - Fn::Select: + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - SwiftStorage0 + - networks + - ':11211' diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 3cddb262..dd5d3855 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -154,6 +154,25 @@ Resources: Ref: AdminPassword admin-token: Ref: AdminToken + bootstack: + bootstrap_nodeid: + Fn::Select: + - 0 + - Fn::Select: + - 0 + - Merge::Map: + undercloud: + - Fn::Select: + - name + - Fn::GetAtt: + - undercloud + - show + nodeid: + Fn::Select: + - name + - Fn::GetAtt: + - undercloud + - show controller-address: Fn::Select: - 0 |