Keystone scripts fails to run

Replace tenant-id by tenant_id and service-id by service_id