Merge "Override nova's glance endpoint only when necessary"

deployment/glance/glance-api-edge-container-puppet.yaml

@@ -78,5 +78,5 @@ outputs:
               - cinder_volume:
                   cinder::glance::glance_api_servers: *glance_api_edge_uri
                 nova_compute:
-                  nova::glance_api_servers: *glance_api_edge_uri
+                  nova::glance_endpoint_override: *glance_api_edge_uri
 

deployment/haproxy/haproxy-edge-container-puppet.yaml

@@ -58,6 +58,20 @@ resources:
 
 outputs:
 
+  glance_api_edge_uri:
+    description: URI of the glance-api service runing at the edge site.
+    value: &glance_api_edge_uri
+      str_replace:
+        template:
+          "PROTOCOL://%{hiera('NETWORK')}:9292"
+        params:
+          PROTOCOL:
+            if:
+            - internal_tls_enabled
+            - https
+            - http
+          NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
+
   role_data:
     description: Role data for the HAproxy role for DCN/Edge.
     value:
@@ -119,3 +133,13 @@ outputs:
                 tripleo::haproxy::ui: false
                 tripleo::haproxy::zaqar_api: false
                 tripleo::haproxy::zaqar_ws: false
+          service_config_settings:
+            map_merge:
+              - get_attr: [HAProxyBase, role_data, service_config_settings]
+              - if:
+                  - glance_api_proxy_enabled
+                  - cinder_volume:
+                      cinder::glance::glance_api_servers: *glance_api_edge_uri
+                    nova_compute:
+                      nova::glance_endpoint_override: *glance_api_edge_uri
+                  - {}

deployment/nova/nova-base-puppet.yaml

@@ -375,7 +375,6 @@ outputs:
           nova::db::database_max_retries: -1
           nova::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
           nova::db::sync_api::db_sync_timeout: {get_param: DatabaseSyncTimeout}
-          nova::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
           nova::use_ipv6: {get_param: NovaIPv6}
           nova::network::neutron::ovs_bridge: {get_param: NovaOVSBridge}
           nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute}