Comment out old values, fixed glance conf

Change-Id: Icd7262d29b01c626516da664351beb39d2efbc4f