Update glance section in metadata

Use default ironic user when connecting to glance

Change-Id: Ibe165dd0d3bceef6d376fcbd49605ff4ed8024f3
Related-Prod: PROD-26283
diff --git a/metadata/service/conductor/cluster.yml b/metadata/service/conductor/cluster.yml
index 20652a6..ea97f73 100644
--- a/metadata/service/conductor/cluster.yml
+++ b/metadata/service/conductor/cluster.yml
@@ -53,12 +53,11 @@
         host: ${_param:cluster_vip_address}
         port: 9292
         region: ${_param:openstack_region}
-        username: glance
-        tenant: service
-        project_name: service
-        project_domain_name: Default
-        user_domain_name: Default
-        password: ${_param:keystone_glance_password}
+        project_domain_id: ${ironic:conductor:identity:project_domain_id}
+        user_domain_id: ${ironic:conductor:identity:user_domain_id}
+        project_name: ${ironic:conductor:identity:tenant}
+        password: ${ironic:conductor:identity:password}
+        username: ${ironic:conductor:identity:user}
       enabled_drivers:
         - agent_ipmitool
         - pxe_ipmitool
diff --git a/metadata/service/conductor/single.yml b/metadata/service/conductor/single.yml
index e50a070..7174d44 100644
--- a/metadata/service/conductor/single.yml
+++ b/metadata/service/conductor/single.yml
@@ -40,7 +40,17 @@
         user_domain_id: ${ironic:conductor:identity:user_domain_id}
         password: ${ironic:conductor:identity:password}
         username: ${ironic:conductor:identity:user}
-
+      glance:
+        auth_strategy: 'keystone'
+        auth_type: password
+        host: ${_param:single_address}
+        port: 9292
+        region: ${_param:openstack_region}
+        project_domain_id: ${ironic:conductor:identity:project_domain_id}
+        user_domain_id: ${ironic:conductor:identity:user_domain_id}
+        project_name: ${ironic:conductor:identity:tenant}
+        password: ${ironic:conductor:identity:password}
+        username: ${ironic:conductor:identity:user}
       enabled_drivers:
         - agent_ipmitool
         - fake