From 8dfdfd8d1b55d7c0fc8899dc65400fdbc2d94ba9 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Wed, 30 Jul 2014 17:05:34 -0400 Subject: python-keystone: Remove openrc file and bb references. This patch removes the openrc file from the keystone package and references to openrc in the python-kystone_git.bb file. Signed-off-by: Liam R. Howlett --- meta-openstack/recipes-devtools/python/python-keystone/openrc | 6 ------ meta-openstack/recipes-devtools/python/python-keystone_git.bb | 2 -- 2 files changed, 8 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-keystone/openrc diff --git a/meta-openstack/recipes-devtools/python/python-keystone/openrc b/meta-openstack/recipes-devtools/python/python-keystone/openrc deleted file mode 100644 index 1d0a1ea..0000000 --- a/meta-openstack/recipes-devtools/python/python-keystone/openrc +++ /dev/null @@ -1,6 +0,0 @@ -export OS_TENANT_NAME=admin -export OS_USERNAME=admin -export OS_PASSWORD=%OS_PASSWORD% -export OS_AUTH_URL="http://localhost:5000/v2.0/" -export SERVICE_ENDPOINT="http://localhost:35357/v2.0" -export SERVICE_TOKEN=%SERVICE_TOKEN% diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 6ce1963..f242844 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -11,7 +11,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://keystone.conf \ file://identity.sh \ file://keystone \ - file://openrc \ file://keystone-search-in-etc-directory-for-config-files.patch \ file://keystone-fix-location-of-files-for-tests.patch \ file://keystone-remove-git-commands-in-tests.patch \ @@ -68,7 +67,6 @@ do_install_append() { install -m 600 ${WORKDIR}/keystone.conf ${KEYSTONE_CONF_DIR}/ install -m 755 ${WORKDIR}/identity.sh ${KEYSTONE_CONF_DIR}/ - install -m 600 ${WORKDIR}/openrc ${KEYSTONE_CONF_DIR}/ install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json install -m 600 ${S}/etc/keystone.conf.sample ${KEYSTONE_CONF_DIR}/keystone.conf.sample -- cgit v1.2.3-54-g00ecf