This logic moved into tripleo-incubator branch