move cinder_catalog_info variable to conf provider

- also tidy up tabs/spacing.