diff options
| author |   Clint Byrum <clint@fewbar.com> | 2013-07-31 14:07:05 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2013-08-14 20:27:54 -0700 |
| commit | 99a1e7525015f4e710e3de6e041cffcd264153cf (patch) | |
| tree | e724a2d9c1a16933a3f9704414f73f5dbfc0d210 | |
| parent | c7241b26e5356c1cedeb687d5066d5822c146777 (diff) | |
Migrate from cfn-hup to os-collect-config
Os-collect-config is meant to replace cfn-hup from heat-cfntools. It
allows pulling from multiple metadata sources and runs continuously.
Fixes bug #1211289
Change-Id: Ia4e9127fb79048bd1022b32a37272f8463a774ae
| -rw-r--r-- | nova-compute-instance.yaml | 18 | ||||
| -rw-r--r-- | overcloud-source.yaml | 24 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 22 |
3 files changed, 29 insertions, 35 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 0da26e65..e93c314c 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -71,16 +71,14 @@ Resources: KeyName: {Ref: KeyName} Metadata: OpenStack::ImageBuilder::Elements: [ nova-compute ] - heat: - access_key_id: - Ref: ComputeKey - secret_key: - Fn::GetAtt: [ ComputeKey, SecretAccessKey ] - stack: - name: {Ref: 'AWS::StackName'} - region: {Ref: 'AWS::Region'} - refresh: - - resource: NovaCompute0 + os-collect-config: + cfn: + access_key_id: + Ref: ComputeKey + secret_access_key: + Fn::GetAtt: [ ComputeKey, SecretAccessKey ] + stack_name: {Ref: 'AWS::StackName'} + path: [ NovaCompute0.Metadata ] nova: compute_driver: {Ref: NovaComputeDriver} compute_libvirt_type: {Ref: NovaComputeLibvirtType} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index f9c280be..88e21f08 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -96,9 +96,18 @@ Resources: glance: db: mysql://glance:unset@localhost/glance host: 0.0.0.0 + os-collect-config: + cfn: + access_key_id: + Ref: Key + path: notcompute.Metadata + secret_access_key: + Fn::GetAtt: + - Key + - SecretAccessKey + stack_name: + Ref: AWS::StackName heat: - access_key_id: - Ref: Key admin_password: unset admin_tenant_name: service admin_user: heat @@ -106,17 +115,6 @@ Resources: db: mysql://heat:unset@localhost/heat heat_watch_server_url: http://0.0.0.0:8003 metadata_server_url: http://0.0.0.0:8000 - refresh: - - resource: notcompute - secret_key: - Fn::GetAtt: - - Key - - SecretAccessKey - stack: - name: - Ref: AWS::StackName - region: - Ref: AWS::Region waitcondition_server_url: http://0.0.0.0:8000/v1/waitcondition interfaces: control: eth0 diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index fbc589ab..b68c0e57 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -55,19 +55,17 @@ Resources: heat_watch_server_url: http://0.0.0.0:8003 metadata_server_url: http://0.0.0.0:8000 waitcondition_server_url: http://0.0.0.0:8000/v1/waitcondition - access_key_id: - Ref: Key - refresh: - - resource: notcompute - secret_key: - Fn::GetAtt: - - Key - - SecretAccessKey - stack: - name: + os-collect-config: + cfn: + access_key_id: + Ref: Key + path: Resources.notcompute + secret_access_key: + Fn::GetAtt: + - Key + - SecretAccessKey + stack_name: Ref: AWS::StackName - region: - Ref: AWS::Region interfaces: control: eth2 keystone: |