aboutsummaryrefslogtreecommitdiffstats
path: root/deployed-server/scripts/get-occ-config.sh
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2016-12-05 16:19:55 -0500
committerJames Slagle <jslagle@redhat.com>2016-12-13 15:50:29 -0500
commit0097da77103e1cd34418d754cc6779b53f0be2f1 (patch)
tree245daedd3997f16eac0128ba1146d789e3bd02b4 /deployed-server/scripts/get-occ-config.sh
parent1e88f875239b30de24552450b623e6892941fa1e (diff)
Use OS::Heat::DeployedServer
The new DeployedServer resource in Heat will provide a native resource for Server resources that are not orchestrated via Nova. This will allow associating SoftwareDeployment's with servers that have not been launched with Nova with Heat directly. With the new resource, all of the SoftwareConfigTransport methods are available, including POLL_TEMP_URL. This patch also updates the get-occ-config.sh script to configure the requests collector in os-collect-config.conf on the deployed servers. Change-Id: I4b80421088acca709fe3f92741c5c052be483131 Partially-implements: blueprint split-stack-software-configuration Depends-On: I07b9a053ecd3ef4411b602bbc6ef985224834cf8
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 c3ce718..404244b 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 "======================"