diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-03 22:56:57 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-03 22:56:57 -0400 |
| commit | 3b9fa62452c636c49cc1bd19436e37882c76b88c (patch) | |
| tree | 3fc5e422f733d9e037f387638a459eeaeecbab61 /meta-openstack/recipes-devtools/python | |
| parent | a8dbfb290b485d41da1bea5dd37907db684d86fc (diff) | |
| download | meta-cloud-services-3b9fa62452c636c49cc1bd19436e37882c76b88c.tar.gz | |
clients: add bash-completion support
Package and enable the bash completion suppor that comes with the
various client packages.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python')
9 files changed, 105 insertions, 22 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index f77cf1d..8d5b9dc 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb | |||
| @@ -162,26 +162,27 @@ RDEPENDS_${PN} += " \ | |||
| 162 | python-glanceclient \ | 162 | python-glanceclient \ |
| 163 | python-keystoneclient \ | 163 | python-keystoneclient \ |
| 164 | python-swiftclient \ | 164 | python-swiftclient \ |
| 165 | python-ceilometerclient \ | ||
| 165 | python-oslo.config \ | 166 | python-oslo.config \ |
| 166 | python-msgpack \ | 167 | python-msgpack \ |
| 167 | python-pecan \ | 168 | python-pecan \ |
| 168 | python-amqp \ | 169 | python-amqp \ |
| 169 | python-singledispatch \ | 170 | python-singledispatch \ |
| 170 | python-flask \ | 171 | python-flask \ |
| 171 | python-werkzeug \ | 172 | python-werkzeug \ |
| 172 | python-itsdangerous \ | 173 | python-itsdangerous \ |
| 173 | python-happybase \ | 174 | python-happybase \ |
| 174 | python-wsme \ | 175 | python-wsme \ |
| 175 | python-eventlet \ | 176 | python-eventlet \ |
| 176 | python-pymongo \ | 177 | python-pymongo \ |
| 177 | python-thrift \ | 178 | python-thrift \ |
| 178 | python-simplegeneric \ | 179 | python-simplegeneric \ |
| 179 | python-webtest \ | 180 | python-webtest \ |
| 180 | python-waitress \ | 181 | python-waitress \ |
| 181 | python-pyyaml \ | 182 | python-pyyaml \ |
| 182 | python-pip \ | 183 | python-pip \ |
| 183 | python-pytz \ | 184 | python-pytz \ |
| 184 | python-pbr \ | 185 | python-pbr \ |
| 185 | " | 186 | " |
| 186 | 187 | ||
| 187 | RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator \ | 188 | RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator \ |
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb index c7c6ff4..dce3e12 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb | |||
| @@ -30,3 +30,15 @@ SRCREV="6f4ec9dc96477131c90040ee00f5535e50d5f914" | |||
| 30 | S = "${WORKDIR}/git" | 30 | S = "${WORKDIR}/git" |
| 31 | 31 | ||
| 32 | inherit setuptools | 32 | inherit setuptools |
| 33 | |||
| 34 | |||
| 35 | PACKAGECONFIG ?= "bash-completion" | ||
| 36 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" | ||
| 37 | |||
| 38 | do_install_append() { | ||
| 39 | install -d ${D}/${sysconfdir}/bash_completion.d | ||
| 40 | install -m 664 ${S}/tools/ceilometer.bash_completion ${D}/${sysconfdir}/bash_completion.d | ||
| 41 | } | ||
| 42 | |||
| 43 | PACKAGES =+ "${BPN}-bash-completion" | ||
| 44 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | ||
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 15a2608..28b0f74 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb | |||
| @@ -162,6 +162,7 @@ RDEPENDS_${PN} += "lvm2 \ | |||
| 162 | python-glanceclient \ | 162 | python-glanceclient \ |
| 163 | python-keystoneclient \ | 163 | python-keystoneclient \ |
| 164 | python-swiftclient \ | 164 | python-swiftclient \ |
| 165 | python-cinderclient \ | ||
| 165 | python-oslo.config \ | 166 | python-oslo.config \ |
| 166 | python-pbr \ | 167 | python-pbr \ |
| 167 | " | 168 | " |
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb index 3c7293b..1f4e4a6 100644 --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb | |||
| @@ -30,3 +30,14 @@ RDEPENDS_${PN} += "python-prettytable \ | |||
| 30 | python-setuptools-git \ | 30 | python-setuptools-git \ |
| 31 | python-pbr \ | 31 | python-pbr \ |
| 32 | " | 32 | " |
| 33 | |||
| 34 | PACKAGECONFIG ?= "bash-completion" | ||
| 35 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" | ||
| 36 | |||
| 37 | do_install_append() { | ||
| 38 | install -d ${D}/${sysconfdir}/bash_completion.d | ||
| 39 | install -m 664 ${S}/tools/cinder.bash_completion ${D}/${sysconfdir}/bash_completion.d | ||
| 40 | } | ||
| 41 | |||
| 42 | PACKAGES =+ "${BPN}-bash-completion" | ||
| 43 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | ||
diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb index fc9f020..9902de1 100644 --- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb | |||
| @@ -27,3 +27,15 @@ SRCREV="55e794f922dd2005a62bb33fd129996b6c476b66" | |||
| 27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
| 28 | 28 | ||
| 29 | inherit setuptools | 29 | inherit setuptools |
| 30 | |||
| 31 | |||
| 32 | PACKAGECONFIG ?= "bash-completion" | ||
| 33 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" | ||
| 34 | |||
| 35 | do_install_append() { | ||
| 36 | install -d ${D}/${sysconfdir}/bash_completion.d | ||
| 37 | install -m 664 ${S}/tools/heat.bash_completion ${D}/${sysconfdir}/bash_completion.d | ||
| 38 | } | ||
| 39 | |||
| 40 | PACKAGES =+ "${BPN}-bash-completion" | ||
| 41 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | ||
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb index 89d8a9a..f376617 100644 --- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb | |||
| @@ -31,3 +31,14 @@ RDEPENDS_${PN} += "python-iso8601 \ | |||
| 31 | python-oslo.config \ | 31 | python-oslo.config \ |
| 32 | python-pbr \ | 32 | python-pbr \ |
| 33 | " | 33 | " |
| 34 | |||
| 35 | PACKAGECONFIG ?= "bash-completion" | ||
| 36 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" | ||
| 37 | |||
| 38 | do_install_append() { | ||
| 39 | install -d ${D}/${sysconfdir}/bash_completion.d | ||
| 40 | install -m 664 ${S}/tools/keystone.bash_completion ${D}/${sysconfdir}/bash_completion.d | ||
| 41 | } | ||
| 42 | |||
| 43 | PACKAGES =+ "${BPN}-bash-completion" | ||
| 44 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | ||
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb index 6d295c2..2aac1e9 100644 --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb | |||
| @@ -27,3 +27,14 @@ SRCREV="6adb11703cb5b55a4af45e8524dc1039fb03176c" | |||
| 27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
| 28 | 28 | ||
| 29 | inherit setuptools | 29 | inherit setuptools |
| 30 | |||
| 31 | PACKAGECONFIG ?= "bash-completion" | ||
| 32 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" | ||
| 33 | |||
| 34 | do_install_append() { | ||
| 35 | install -d ${D}/${sysconfdir}/bash_completion.d | ||
| 36 | install -m 664 ${S}/tools/neutron.bash_completion ${D}/${sysconfdir}/bash_completion.d | ||
| 37 | } | ||
| 38 | |||
| 39 | PACKAGES =+ "${BPN}-bash-completion" | ||
| 40 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | ||
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 18e69aa..e88220a 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
| @@ -114,6 +114,9 @@ do_install_append() { | |||
| 114 | fi | 114 | fi |
| 115 | 115 | ||
| 116 | cp run_tests.sh ${NOVA_CONF_DIR} | 116 | cp run_tests.sh ${NOVA_CONF_DIR} |
| 117 | |||
| 118 | install -d ${D}/${sysconfdir}/bash_completion.d | ||
| 119 | install -m 664 ${S}/tools/nova-manage.bash_completion ${D}/${sysconfdir}/bash_completion.d | ||
| 117 | } | 120 | } |
| 118 | 121 | ||
| 119 | pkg_postinst_${SRCNAME}-setup () { | 122 | pkg_postinst_${SRCNAME}-setup () { |
| @@ -139,9 +142,11 @@ pkg_postinst_${SRCNAME}-common () { | |||
| 139 | fi | 142 | fi |
| 140 | 143 | ||
| 141 | if [ -d /home/root ]; then | 144 | if [ -d /home/root ]; then |
| 142 | echo "source /etc/nova/openrc" > /home/root/.bashrc | 145 | echo "source /etc/nova/openrc" >> /home/root/.bashrc |
| 146 | echo "source /etc/nova/openrc" >> /home/root/.profile | ||
| 143 | else | 147 | else |
| 144 | echo "source /etc/nova/openrc" > /root/.bashrc | 148 | echo "source /etc/nova/openrc" >> /root/.bashrc |
| 149 | echo "source /etc/nova/openrc" >> /root/.profile | ||
| 145 | fi | 150 | fi |
| 146 | } | 151 | } |
| 147 | 152 | ||
| @@ -161,6 +166,13 @@ PACKAGES += " ${SRCNAME}-cert" | |||
| 161 | PACKAGES += " ${SRCNAME}-conductor" | 166 | PACKAGES += " ${SRCNAME}-conductor" |
| 162 | PACKAGES += " ${SRCNAME}-api" | 167 | PACKAGES += " ${SRCNAME}-api" |
| 163 | 168 | ||
| 169 | PACKAGECONFIG ?= "bash-completion" | ||
| 170 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-bash-completion" | ||
| 171 | |||
| 172 | PACKAGES =+ "${BPN}-bash-completion" | ||
| 173 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | ||
| 174 | |||
| 175 | |||
| 164 | ALLOW_EMPTY_${SRCNAME}-setup = "1" | 176 | ALLOW_EMPTY_${SRCNAME}-setup = "1" |
| 165 | 177 | ||
| 166 | FILES_${PN} = "${libdir}/*" | 178 | FILES_${PN} = "${libdir}/*" |
| @@ -215,6 +227,7 @@ RDEPENDS_${PN} = " libvirt \ | |||
| 215 | python-anyjson \ | 227 | python-anyjson \ |
| 216 | python-babel \ | 228 | python-babel \ |
| 217 | python-boto \ | 229 | python-boto \ |
| 230 | python-novaclient \ | ||
| 218 | python-cinderclient \ | 231 | python-cinderclient \ |
| 219 | python-cliff \ | 232 | python-cliff \ |
| 220 | python-cheetah \ | 233 | python-cheetah \ |
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb index 7ac9b34..ff81924 100644 --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb | |||
| @@ -3,7 +3,6 @@ HOMEPAGE = "https://github.com/openstack/python-novaclient" | |||
| 3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
| 4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669" |
| 6 | DEPENDS = "python-setuptools-git" | ||
| 7 | 6 | ||
| 8 | PR = "r0" | 7 | PR = "r0" |
| 9 | 8 | ||
| @@ -18,6 +17,7 @@ S = "${WORKDIR}/git" | |||
| 18 | 17 | ||
| 19 | inherit setuptools | 18 | inherit setuptools |
| 20 | 19 | ||
| 20 | DEPENDS = "python-setuptools-git" | ||
| 21 | DEPENDS += " \ | 21 | DEPENDS += " \ |
| 22 | python-pip \ | 22 | python-pip \ |
| 23 | python-pbr \ | 23 | python-pbr \ |
| @@ -29,3 +29,14 @@ RDEPENDS_${PN} += "python-iso8601 \ | |||
| 29 | python-simplejson \ | 29 | python-simplejson \ |
| 30 | python-pbr \ | 30 | python-pbr \ |
| 31 | " | 31 | " |
| 32 | |||
| 33 | PACKAGECONFIG ?= "bash-completion" | ||
| 34 | PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion ${BPN}-bash-completion" | ||
| 35 | |||
| 36 | do_install_append() { | ||
| 37 | install -d ${D}/${sysconfdir}/bash_completion.d | ||
| 38 | install -m 664 ${S}/tools/nova.bash_completion ${D}/${sysconfdir}/bash_completion.d | ||
| 39 | } | ||
| 40 | |||
| 41 | PACKAGES =+ "${BPN}-bash-completion" | ||
| 42 | FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*" | ||
