Add HA bits for OS metadata service

rcbops-cookbooks · Jan 31, 2014 · 94570a9 · 94570a9
1 parent e383e35
commit 94570a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -50,6 +50,13 @@
 default["nova"]["services"]["admin-api"]["port"] = 8774
 default["nova"]["services"]["admin-api"]["path"] = "/v2/%(tenant_id)s"
 
+default["nova"]["services"]["api-metadata"]["scheme"] = "http"
+# TODO(breu): do we need network here?
+default["nova"]["services"]["api-metadata"]["network"] = "management"
+default["nova"]["services"]["api-metadata"]["port"] = 8775
+# TODO(breu): do we need path here?
+default["nova"]["services"]["api-metadata"]["path"] = "/"
+
 default["nova"]["services"]["ec2-admin"]["scheme"] = "http"
 default["nova"]["services"]["ec2-admin"]["network"] = "public"
 default["nova"]["services"]["ec2-admin"]["port"] = 8773

diff --git a/providers/conf.rb b/providers/conf.rb
@@ -28,6 +28,9 @@
   # Get endpoint info for nova-api
   api_bind = get_bind_endpoint("nova", "api")
 
+  # Get the socket bind information for nova-api-metadata
+  metadata_api_bind = get_bind_endpoint("nova", "api-metadata")
+
   # Get endpoint info for nova-api-ec2
   ec2_bind = get_bind_endpoint("nova", "ec2-public")
 
@@ -222,6 +225,8 @@
       "vpn_image_id" => node["nova"]["config"]["vpn_image_id"],
       "force_config_drive" => node["nova"]["config"]["force_config_drive"],
       "cinder_catalog_info" => node["nova"]["services"]["volume"]["cinder_catalog_info"],
+      "metadata_listen" => metadata_api_bind["host"],
+      "metadata_listen_port" => metadata_api_bind["port"],
       "osapi_compute_listen" => api_bind["host"],
       "osapi_compute_listen_port" => api_bind["port"],
       "ec2_listen" => ec2_bind["host"],

diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb
@@ -103,6 +103,8 @@ cinder_catalog_info=<%= @cinder_catalog_info %>
 ##### API #####
 ec2_workers=<%= node["nova"]["config"]["ec2_workers"] %>
 osapi_compute_workers=<%= node["nova"]["config"]["osapi_compute_workers"] %>
+metadata_listen=<%= @metadata_listen %>
+metadata_listen_port=<%= @metadata_listen_port %>
 metadata_workers=<%= node["nova"]["config"]["metadata_workers"] %>
 osapi_volume_workers=<%= node["nova"]["config"]["osapi_volume_workers"] %>
 osapi_compute_listen=<%= @osapi_compute_listen %>