From: Derek Higgins Date: Tue, 29 Oct 2013 14:48:21 +0000 (+0000) Subject: Rename heat_watch_server_url to watch_server_url X-Git-Tag: opnfv-6.0.0~2918 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=99b21423ee679c1d81402969c8c2b258f3b9080b;p=apex-tripleo-heat-templates.git Rename heat_watch_server_url to watch_server_url The other *_server_url parameters are not prefixed with heat_ and this is already in the heat namespace. Change-Id: I24effcfedccb7b69b4e4d022db6676da51083401 --- diff --git a/overcloud-source.yaml b/overcloud-source.yaml index c8aa0465..9f9c5957 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -194,7 +194,7 @@ Resources: admin_user: heat auth_encryption_key: unset___________ db: mysql://heat:unset@localhost/heat - heat_watch_server_url: + watch_server_url: Fn::Join: - '' - - 'http://' diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml index cfc6f4ff..3006cd0f 100644 --- a/undercloud-bm.yaml +++ b/undercloud-bm.yaml @@ -110,7 +110,7 @@ Resources: admin_user: heat auth_encryption_key: unset___________ db: mysql://heat:unset@localhost/heat - heat_watch_server_url: + watch_server_url: Fn::Join: - '' - - http:// diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index e8502a57..ebe09b16 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -115,7 +115,7 @@ Resources: admin_user: heat auth_encryption_key: unset___________ db: mysql://heat:unset@localhost/heat - heat_watch_server_url: + watch_server_url: Fn::Join: - '' - - http://