summaryrefslogtreecommitdiffstats
path: root/deployed-server/scripts/get-occ-config.sh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-20 20:24:22 +0000
committerGerrit Code Review <review@openstack.org>2016-12-20 20:24:22 +0000
commit724670088954dd76c0fedcbae91cc58826ba0e0d (patch)
treee427d5c87cd3bbe7e8b1b87cf335ed7c6881e88b /deployed-server/scripts/get-occ-config.sh
parent08bc584cd600626bec5e1aeef0ddf91a49d1eb9c (diff)
parent0097da77103e1cd34418d754cc6779b53f0be2f1 (diff)
Merge "Use OS::Heat::DeployedServer"
Diffstat (limited to 'deployed-server/scripts/get-occ-config.sh')
-rwxr-xr-xdeployed-server/scripts/get-occ-config.sh13
1 files changed, 4 insertions, 9 deletions
diff --git a/deployed-server/scripts/get-occ-config.sh b/deployed-server/scripts/get-occ-config.sh
index c3ce7183..404244b1 100755
--- a/deployed-server/scripts/get-occ-config.sh
+++ b/deployed-server/scripts/get-occ-config.sh
@@ -79,24 +79,19 @@ for role in $OVERCLOUD_ROLES; do
server_stack=$(openstack stack resource show $stack $server_resource_name -c physical_resource_id -f value)
done
- deployed_server_stack=$(openstack stack resource show $server_stack deployed-server -c physical_resource_id -f value)
+ deployed_server_metadata_url=$(openstack stack resource metadata $server_stack deployed-server | jq -r '.["os-collect-config"].request.metadata_url')
echo "======================"
echo "$role$i os-collect-config.conf configuration:"
config="
[DEFAULT]
-collectors=heat
+collectors=request
command=os-refresh-config
polling_interval=30
-[heat]
-user_id=$admin_user_id
-password=$OS_PASSWORD
-auth_url=$OS_AUTH_URL
-project_id=$admin_project_id
-stack_id=$deployed_server_stack
-resource_name=deployed-server-config"
+[request]
+metadata_url=$deployed_server_metadata_url"
echo "$config"
echo "======================"