Bug 1123893

+++ This bug was initially created as a clone of Bug #1121864 +++

Description:
If there is a cartridge existing in container, for example php, and try to add another different cartridge via oo-cartridge after deleting the existing one, there will be an error appears although the cartridge can be added successfully: 
Cartridge add failed
CLIENT_ERROR: Unexpected error: Cartridge manifest not found: /var/lib/openshift/123456/php/metadata/manifest.yml missing

Version-Release number of selected component (if applicable):
devenv_4992

How reproducible:
always

steps to Reproduce:
1. Create a container:
#oo-devel-node app-create --with-container-uuid '123456' --with-app-uuid '123456' --with-namespace 'dom1' --with-app-name 'app1'
2. Add a cartridge to it
#oo-cartridge  --with-container-uuid 123456 --action add --with-cartridge-name php-5.3
3. Delete the cartridge
#oo-cartridge --with-container-uuid 123456 --action delete --with-cartridge-name php-5.3
4. Add a different one 
#oo-cartridge  --with-container-uuid 123456 --action add --with-cartridge-name mysql-5.5

Actual results:
An error appears, however the cartridge can be added successfully:
Cartridge add failed
Cartridge manifest not found: /var/lib/openshift/123456/php/metadata/manifest.yml missing

Expected results:
It should be added without any errors.

Additional info:
There is no this error if try to add a same cartridge type in step 4.

--- Additional comment from Jhon Honce on 2014-07-24 14:43:23 EDT ---

Fixed in https://github.com/openshift/origin-server/pull/5656

--- Additional comment from openshift-github-bot on 2014-07-24 16:30:27 EDT ---

Commit pushed to master at https://github.com/openshift/origin-server

https://github.com/openshift/origin-server/commit/05b073ade1cd747e0fbcc4a88fb928a483120dd5
Bug 1121864 - Cleanup OPENSHIFT_PRIMARY_CARTRIDGE_DIR

--- Additional comment from Wenjing Zheng on 2014-07-24 21:52:39 EDT ---

Verified on devenv_5008, the cartridge can be added after another different cartridge being deleted.