diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 15 | ||||
| -rw-r--r-- | undercloud-source.yaml | 2 |
4 files changed, 20 insertions, 3 deletions
@@ -9,6 +9,10 @@ generated_templates = \ overcloud_source_deps = nova-compute-instance.yaml all: $(generated_templates) +VALIDATE := $(patsubst %,validate-%,$(generated_templates)) +validate-all: $(VALIDATE) +$(VALIDATE): + heat template-validate -f $(subst validate-,,$@) overcloud.yaml: overcloud-source.yaml block-storage.yaml swift-deploy.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml nova-compute-config.yaml $(overcloud_source_deps) python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} --scale BlockStorage=$${BLOCKSTORAGESCALE='0'} overcloud-source.yaml block-storage.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml swift-deploy.yaml nova-compute-config.yaml > $@.tmp diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index bb75ed90..baa20e29 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -177,6 +177,8 @@ Resources: Ref: ImageUpdatePolicy flavor: {Ref: OvercloudComputeFlavor} key_name: {Ref: KeyName} + networks: + - network: ctlplane user_data_format: SOFTWARE_CONFIG NovaCompute0Deploy: DependsOn: [controller0Deployment] diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 6caa6cf2..a8fcb9a3 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -294,7 +294,7 @@ Resources: 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']]} + NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/ovs_neutron']]} NeutronNetworkType: "gre" NeutronEnableTunnelling: "True" NeutronFlatNetworks: @@ -378,7 +378,7 @@ Resources: backend: swift db: mysql://glance:unset@localhost/glance host: - get_input: controller_host + get_input: controller_virtual_ip port: Ref: GlancePort protocol: @@ -403,6 +403,13 @@ Resources: watch_server_url: {get_input: heat.watch_server_url} metadata_server_url: {get_input: heat.metadata_server_url} waitcondition_server_url: {get_input: heat.waitcondition_server_url} + horizon: + caches: + memcached: + nodes: + Merge::Map: + controller0: + {"Fn::Select": [ name, {"Fn::GetAtt": [controller0, show]} ] } keystone: db: mysql://keystone:unset@localhost/keystone host: @@ -477,7 +484,7 @@ Resources: - {server: {Ref: NtpServer}, fudge: "stratum 0"} keepalived: keepalive_interface: - Ref: NeutronPublicInterface + Ref: ControlVirtualInterface priority: 101 virtual_ips: - @@ -539,6 +546,8 @@ Resources: Ref: OvercloudControlFlavor key_name: Ref: KeyName + networks: + - network: ctlplane user_data_format: SOFTWARE_CONFIG controller0AllNodesConfig: Type: OS::Heat::StructuredDeployment diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 66517586..aa0c9eed 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -305,6 +305,8 @@ Resources: Ref: KeyName image_update_policy: Ref: ImageUpdatePolicy + networks: + - network: ctlplane user_data_format: SOFTWARE_CONFIG 99_undercloudDeployment: Type: OS::Heat::StructuredDeployment |