summaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/classes/monitor.bbclass12
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinderclient_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python-glance_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-heat_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-heatclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutron_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-rally_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python-swift_git.bb6
-rw-r--r--[-rwxr-xr-x]meta-openstack/recipes-devtools/python/python-trove_git.bb6
-rw-r--r--meta-openstack/recipes-devtools/python/python3-glance-store_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-taskflow_git.bb4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb2
-rw-r--r--meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb4
-rw-r--r--meta-openstack/recipes-extended/qpid/qpid_0.20.bb2
-rw-r--r--meta-openstack/recipes-extended/tempest/tempest_git.bb6
-rw-r--r--meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb4
-rw-r--r--meta-openstack/recipes-support/salt/salt_3001.1.bb14
27 files changed, 52 insertions, 52 deletions
diff --git a/meta-openstack/classes/monitor.bbclass b/meta-openstack/classes/monitor.bbclass
index e217780..7810b9b 100644
--- a/meta-openstack/classes/monitor.bbclass
+++ b/meta-openstack/classes/monitor.bbclass
@@ -1,9 +1,9 @@
1MONITOR_STAGING_DIR="${STAGING_DIR}/monitor" 1MONITOR_STAGING_DIR = "${STAGING_DIR}/monitor"
2MONITOR_STAGING_SERVICES_DIR="${MONITOR_STAGING_DIR}/services" 2MONITOR_STAGING_SERVICES_DIR = "${MONITOR_STAGING_DIR}/services"
3MONITOR_STAGING_CHECKS_DIR="${MONITOR_STAGING_DIR}/checks" 3MONITOR_STAGING_CHECKS_DIR = "${MONITOR_STAGING_DIR}/checks"
4MONITOR_CONFIG_DIR="${IMAGE_ROOTFS}/etc/monitor" 4MONITOR_CONFIG_DIR = "${IMAGE_ROOTFS}/etc/monitor"
5MONITOR_CONFIG_SERVICES_DIR="${MONITOR_CONFIG_DIR}/services" 5MONITOR_CONFIG_SERVICES_DIR = "${MONITOR_CONFIG_DIR}/services"
6MONITOR_CONFIG_CHECKS_DIR="${MONITOR_CONFIG_DIR}/checks" 6MONITOR_CONFIG_CHECKS_DIR = "${MONITOR_CONFIG_DIR}/checks"
7 7
8addtask monitor_install before do_package after do_install 8addtask monitor_install before do_package after do_install
9addtask monitor_clean before do_clean 9addtask monitor_clean before do_clean
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index 90ed8d7..ffc7a63 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
@@ -21,7 +21,7 @@ PV = "2015.1.0+git${SRCPV}"
21inherit update-rc.d setuptools3 identity hosts useradd default_configs monitor 21inherit update-rc.d setuptools3 identity hosts useradd default_configs monitor
22 22
23SERVICECREATE_PACKAGES = "${SRCNAME}-setup" 23SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
24KEYSTONE_HOST="${CONTROLLER_IP}" 24KEYSTONE_HOST = "${CONTROLLER_IP}"
25 25
26# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 26# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
27# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 27# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 1592cd2..9eec72c 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -20,7 +20,7 @@ PV = "5.0.0+git${SRCPV}"
20CEILOMETER_SECRET ?= "12121212" 20CEILOMETER_SECRET ?= "12121212"
21 21
22SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-reseller" 22SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-reseller"
23KEYSTONE_HOST="${CONTROLLER_IP}" 23KEYSTONE_HOST = "${CONTROLLER_IP}"
24 24
25# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 25# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
26# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 26# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 5f56024..f72036d 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -35,7 +35,7 @@ USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false
35 35
36CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" 36CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift"
37 37
38KEYSTONE_HOST="${CONTROLLER_IP}" 38KEYSTONE_HOST = "${CONTROLLER_IP}"
39 39
40CINDER_LVM_VOLUME_BACKING_FILE_SIZE ?= "2G" 40CINDER_LVM_VOLUME_BACKING_FILE_SIZE ?= "2G"
41CINDER_NFS_VOLUME_SERVERS_DEFAULT = "controller:/etc/cinder/nfs_volumes" 41CINDER_NFS_VOLUME_SERVERS_DEFAULT = "controller:/etc/cinder/nfs_volumes"
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index 2f62677..0200030 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -12,8 +12,8 @@ SRC_URI = "\
12 file://cinder-api-check.sh \ 12 file://cinder-api-check.sh \
13 " 13 "
14 14
15PV="3.1.0+git${SRCPV}" 15PV = "3.1.0+git${SRCPV}"
16SRCREV="3640aeab6e11987288a2f149fbeedb1c026045e2" 16SRCREV = "3640aeab6e11987288a2f149fbeedb1c026045e2"
17 17
18inherit setuptools3 monitor 18inherit setuptools3 monitor
19 19
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index 06e4d93..5e7bd88 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -34,7 +34,7 @@ GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\
34 glance.store.http.Store" 34 glance.store.http.Store"
35 35
36SERVICECREATE_PACKAGES = "${SRCNAME}-setup" 36SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
37KEYSTONE_HOST="${CONTROLLER_IP}" 37KEYSTONE_HOST = "${CONTROLLER_IP}"
38 38
39# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 39# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
40# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 40# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index c46fc7a..cb833fb 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -19,7 +19,7 @@ SRCREV = "4348b7ababd1048e17ec354ca38c903c908cd74e"
19PV = "5.0.0+git${SRCPV}" 19PV = "5.0.0+git${SRCPV}"
20 20
21SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn" 21SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn"
22KEYSTONE_HOST="${CONTROLLER_IP}" 22KEYSTONE_HOST = "${CONTROLLER_IP}"
23 23
24# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 24# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
25# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 25# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
index b1f7b4f..40ac44b 100644
--- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
14 python-pbr-native \ 14 python-pbr-native \
15 " 15 "
16 16
17RDEPENDS:${PN} +="python-cliff \ 17RDEPENDS:${PN} += "python-cliff \
18 python-httplib2 \ 18 python-httplib2 \
19 python-iso8601 \ 19 python-iso8601 \
20 python-prettytable \ 20 python-prettytable \
diff --git a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
index 375969b..4b7c188 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb
@@ -8,8 +8,8 @@ PR = "r0"
8 8
9SRC_URI = "git://github.com/SUSE-Cloud/keystone-hybrid-backend.git;branch=havana;protocol=https" 9SRC_URI = "git://github.com/SUSE-Cloud/keystone-hybrid-backend.git;branch=havana;protocol=https"
10 10
11PV="git${SRCPV}" 11PV = "git${SRCPV}"
12SRCREV="0bd376242f8522edef7031d2339b9533b86c17aa" 12SRCREV = "0bd376242f8522edef7031d2339b9533b86c17aa"
13 13
14inherit python3-dir 14inherit python3-dir
15 15
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 5ec5af2..7fae4c7 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -35,7 +35,7 @@ USERADD_PARAM:${PN} = "--system -m -s /bin/false keystone"
35LDAP_DN ?= "dc=my-domain,dc=com" 35LDAP_DN ?= "dc=my-domain,dc=com"
36 36
37SERVICECREATE_PACKAGES = "${SRCNAME}-setup" 37SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
38KEYSTONE_HOST="${CONTROLLER_IP}" 38KEYSTONE_HOST = "${CONTROLLER_IP}"
39 39
40# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be 40# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be
41# set. If the flag for a parameter in the list is not set here, the default 41# set. If the flag for a parameter in the list is not set here, the default
diff --git a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
index 84e766d..adefdd9 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron-lib_git.bb
@@ -8,8 +8,8 @@ SRC_URI = "\
8 git://git.openstack.org/openstack/neutron-lib.git;branch=stable/pike \ 8 git://git.openstack.org/openstack/neutron-lib.git;branch=stable/pike \
9 " 9 "
10 10
11PV="1.9.1+git${SRCPV}" 11PV = "1.9.1+git${SRCPV}"
12SRCREV="f0d7e470c2ef1702b2715ceb2fd8a00fce2a23be" 12SRCREV = "f0d7e470c2ef1702b2715ceb2fd8a00fce2a23be"
13 13
14inherit setuptools3 14inherit setuptools3
15 15
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 7229e47..7ed21af 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -40,7 +40,7 @@ GROUPADD_PARAM:${PN} = "--system ${GROUP}"
40USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}" 40USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/neutron -s /bin/false -g ${GROUP} ${USER}"
41 41
42SERVICECREATE_PACKAGES = "${SRCNAME}-setup" 42SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
43KEYSTONE_HOST="${CONTROLLER_IP}" 43KEYSTONE_HOST = "${CONTROLLER_IP}"
44 44
45# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 45# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
46# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 46# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index fc96b51..247e816 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -51,7 +51,7 @@ USERADD_PARAM:${PN} = "--system -m -d ${localstatedir}/lib/nova -s /bin/false -g
51PLACEMENT_USER = "placement" 51PLACEMENT_USER = "placement"
52 52
53SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-ec2" 53SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-ec2"
54KEYSTONE_HOST="${CONTROLLER_IP}" 54KEYSTONE_HOST = "${CONTROLLER_IP}"
55 55
56# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 56# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
57# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 57# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-devtools/python/python-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb
index 11bd331..015c34a 100644
--- a/meta-openstack/recipes-devtools/python/python-rally_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb
@@ -20,8 +20,8 @@ SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master;protocol=htt
20 file://verification-subunit2json-fail-to-open-result-file.patch \ 20 file://verification-subunit2json-fail-to-open-result-file.patch \
21" 21"
22 22
23SRCREV="b297cf00750f263b8b5bdeb71f6952f672e87f5a" 23SRCREV = "b297cf00750f263b8b5bdeb71f6952f672e87f5a"
24PV="git${SRCPV}" 24PV = "git${SRCPV}"
25 25
26inherit setuptools3 update-rc.d hosts identity default_configs 26inherit setuptools3 update-rc.d hosts identity default_configs
27 27
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index e734d24..08836d2 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
16 file://cluster.conf \ 16 file://cluster.conf \
17" 17"
18 18
19SRCREV="4ca08cc395e686265574366497a6869e94eebcb2" 19SRCREV = "4ca08cc395e686265574366497a6869e94eebcb2"
20PV="2.2.2+git${SRCPV}" 20PV = "2.2.2+git${SRCPV}"
21 21
22inherit setuptools3 python3-dir update-rc.d hosts identity 22inherit setuptools3 python3-dir update-rc.d hosts identity
23 23
@@ -29,7 +29,7 @@ inherit setuptools3 python3-dir update-rc.d hosts identity
29SWIFT_BACKING_FILE_SIZE ?= "2G" 29SWIFT_BACKING_FILE_SIZE ?= "2G"
30 30
31SERVICECREATE_PACKAGES = "${SRCNAME}-setup" 31SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
32KEYSTONE_HOST="${CONTROLLER_IP}" 32KEYSTONE_HOST = "${CONTROLLER_IP}"
33 33
34# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 34# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
35# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 35# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
index a0dfaa4..16d8f22 100755..100644
--- a/meta-openstack/recipes-devtools/python/python-trove_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb
@@ -10,13 +10,13 @@ SRC_URI = "git://github.com/openstack/trove.git;branch=master;protocol=https \
10 file://trove-init \ 10 file://trove-init \
11 " 11 "
12 12
13SRCREV="11996635299396f181f5aec3c6825f8011d45e2c" 13SRCREV = "11996635299396f181f5aec3c6825f8011d45e2c"
14PV="4.0.0+git${SRCPV}" 14PV = "4.0.0+git${SRCPV}"
15 15
16inherit update-rc.d setuptools3 identity hosts useradd default_configs 16inherit update-rc.d setuptools3 identity hosts useradd default_configs
17 17
18SERVICECREATE_PACKAGES = "${SRCNAME}-setup" 18SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
19KEYSTONE_HOST="${CONTROLLER_IP}" 19KEYSTONE_HOST = "${CONTROLLER_IP}"
20 20
21# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be 21# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be
22# set. If the flag for a parameter in the list is not set here, the default 22# set. If the flag for a parameter in the list is not set here, the default
diff --git a/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
index 9c923f6..3ecd5eb 100644
--- a/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-glance-store_git.bb
@@ -8,8 +8,8 @@ SRC_URI = "\
8 git://git.openstack.org/openstack/glance_store.git;branch=stable/pike \ 8 git://git.openstack.org/openstack/glance_store.git;branch=stable/pike \
9 " 9 "
10 10
11PV="0.22.0+git${SRCPV}" 11PV = "0.22.0+git${SRCPV}"
12SRCREV="49c915f498fc8d91c98fcf4e07ceecdcf167fc5a" 12SRCREV = "49c915f498fc8d91c98fcf4e07ceecdcf167fc5a"
13 13
14inherit setuptools3 14inherit setuptools3
15 15
diff --git a/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb b/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb
index 6867600..fa23937 100644
--- a/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-magnumclient_3.3.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
16 python3-pbr-native \ 16 python3-pbr-native \
17 " 17 "
18 18
19RDEPENDS:${PN} +=" \ 19RDEPENDS:${PN} += " \
20 python3-pbr \ 20 python3-pbr \
21 python3-babel \ 21 python3-babel \
22 python3-oslo.config \ 22 python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb b/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb
index 7e51ec6..8092607 100644
--- a/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-manilaclient_2.4.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
16 python3-pbr-native \ 16 python3-pbr-native \
17 " 17 "
18 18
19RDEPENDS:${PN} +=" \ 19RDEPENDS:${PN} += " \
20 python3-pbr \ 20 python3-pbr \
21 python3-iso8601 \ 21 python3-iso8601 \
22 python3-oslo.config \ 22 python3-oslo.config \
diff --git a/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb b/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb
index 7f79754..98027dc 100644
--- a/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-mistralclient_4.1.1.bb
@@ -18,7 +18,7 @@ DEPENDS += " \
18 python3-pbr-native \ 18 python3-pbr-native \
19 " 19 "
20 20
21RDEPENDS:${PN} +=" \ 21RDEPENDS:${PN} += " \
22 python3-cliff \ 22 python3-cliff \
23 python3-pbr \ 23 python3-pbr \
24 python3-keystoneclient \ 24 python3-keystoneclient \
diff --git a/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
index 7425580..44a1660 100644
--- a/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-taskflow_git.bb
@@ -8,8 +8,8 @@ SRC_URI = "\
8 git://git.openstack.org/openstack/taskflow.git;branch=stable/pike \ 8 git://git.openstack.org/openstack/taskflow.git;branch=stable/pike \
9 " 9 "
10 10
11PV="2.14.1+git${SRCPV}" 11PV = "2.14.1+git${SRCPV}"
12SRCREV="ed867c4fd17e4102a133c313a13af37baccf14a4" 12SRCREV = "ed867c4fd17e4102a133c313a13af37baccf14a4"
13 13
14inherit setuptools3 14inherit setuptools3
15 15
diff --git a/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb b/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb
index 55423b7..28d37f1 100644
--- a/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-zaqarclient_2.0.0.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
16 python3-pbr-native \ 16 python3-pbr-native \
17 " 17 "
18 18
19RDEPENDS:${PN} +=" \ 19RDEPENDS:${PN} += " \
20 python3-pbr \ 20 python3-pbr \
21 python3-requests \ 21 python3-requests \
22 python3-six \ 22 python3-six \
diff --git a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
index 23e326b..16b4a70 100644
--- a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
+++ b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "An image containing the cirros cloud guest"
2DESCRIPTION = "CirrOS a tiny cloud guest" 2DESCRIPTION = "CirrOS a tiny cloud guest"
3HOMEPAGE = "https://launchpad.net/cirros" 3HOMEPAGE = "https://launchpad.net/cirros"
4 4
5LICENSE="GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
6 6
7SRC_URI = "http://download.cirros-cloud.net/${PV}/${PN}-${PV}-x86_64-disk.img" 7SRC_URI = "http://download.cirros-cloud.net/${PV}/${PN}-${PV}-x86_64-disk.img"
8 8
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "a2ca56aeded5a5bcaa6104fb14ec07b1ceb65222e2890bef8a89b8d2da
11 11
12LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" 12LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
13 13
14INHIBIT_PACKAGE_STRIP="1" 14INHIBIT_PACKAGE_STRIP = "1"
15 15
16do_install() { 16do_install() {
17 install -d ${D}/${ROOT_HOME}/images 17 install -d ${D}/${ROOT_HOME}/images
diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
index b879dcc..f83eb65 100644
--- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
@@ -24,7 +24,7 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
24export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" 24export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE"
25export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" 25export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
26export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" 26export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
27export PERL="${STAGING_BINDIR}/perl" 27export PERL = "${STAGING_BINDIR}/perl"
28 28
29EXTRA_OECONF += " --without-help2man SASL_PASSWD=/usr/sbin/saslpasswd2" 29EXTRA_OECONF += " --without-help2man SASL_PASSWD=/usr/sbin/saslpasswd2"
30EXTRA_OEMAKE += " CPPFLAGS=-Wno-unused-function \ 30EXTRA_OEMAKE += " CPPFLAGS=-Wno-unused-function \
diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb
index 545d71f..881b091 100644
--- a/meta-openstack/recipes-extended/tempest/tempest_git.bb
+++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb
@@ -14,11 +14,11 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=http
14 file://logging.conf \ 14 file://logging.conf \
15" 15"
16 16
17SRCREV="2707a0f065e52d8331d12c983ead95de1224cb32" 17SRCREV = "2707a0f065e52d8331d12c983ead95de1224cb32"
18PV="2014.1+git${SRCPV}" 18PV = "2014.1+git${SRCPV}"
19 19
20SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-setup-altdemo ${SRCNAME}-setup-admin" 20SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-setup-altdemo ${SRCNAME}-setup-admin"
21KEYSTONE_HOST="${CONTROLLER_IP}" 21KEYSTONE_HOST = "${CONTROLLER_IP}"
22 22
23# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. 23# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
24# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. 24# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
index c6e225c..255439a 100644
--- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
+++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb
@@ -10,8 +10,8 @@ SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0;protocol=https \
10 file://more-Add-explicit-breaks-to-avoid-implicit-passthrough.patch \ 10 file://more-Add-explicit-breaks-to-avoid-implicit-passthrough.patch \
11" 11"
12 12
13SRCREV="af44211739136e22471a2897383f34586284bf86" 13SRCREV = "af44211739136e22471a2897383f34586284bf86"
14PV="2.0.14+git${SRCPV}" 14PV = "2.0.14+git${SRCPV}"
15 15
16inherit setuptools3 pkgconfig 16inherit setuptools3 pkgconfig
17 17
diff --git a/meta-openstack/recipes-support/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
index 967ee6f..101ce21 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.1.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
@@ -95,13 +95,13 @@ CONFFILES:${PN}-minion = "${sysconfdir}/${PN}/minion"
95FILES:${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy ${systemd_system_unitdir}/salt-minion.service" 95FILES:${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy ${systemd_system_unitdir}/salt-minion.service"
96 96
97SUMMARY:${PN}-common = "shared libraries that salt requires for all packages" 97SUMMARY:${PN}-common = "shared libraries that salt requires for all packages"
98DESCRIPTION:${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \ 98DESCRIPTION:${PN}-common = "${DESCRIPTION_COMMON} This particular package provides shared libraries that \
99salt-master, salt-minion, and salt-syndic require to function." 99salt-master, salt-minion, and salt-syndic require to function."
100RDEPENDS:${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-distro" 100RDEPENDS:${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-distro"
101RRECOMMENDS:${PN}-common = "lsb-release" 101RRECOMMENDS:${PN}-common = "lsb-release"
102RSUGGESTS:${PN}-common = "python3-mako python3-git" 102RSUGGESTS:${PN}-common = "python3-mako python3-git"
103RCONFLICTS:${PN}-common = "python3-mako (< 0.7.0)" 103RCONFLICTS:${PN}-common = "python3-mako (< 0.7.0)"
104CONFFILES:${PN}-common="${sysconfdir}/logrotate.d/${PN}" 104CONFFILES:${PN}-common = "${sysconfdir}/logrotate.d/${PN}"
105FILES:${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}" 105FILES:${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}"
106 106
107SUMMARY:${PN}-ssh = "remote manager to administer servers via salt" 107SUMMARY:${PN}-ssh = "remote manager to administer servers via salt"
@@ -109,7 +109,7 @@ DESCRIPTION:${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides
109is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\ 109is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\
110 to be installed on the remote host." 110 to be installed on the remote host."
111RDEPENDS:${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" 111RDEPENDS:${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
112CONFFILES:${PN}-ssh="${sysconfdir}/${PN}/roster" 112CONFFILES:${PN}-ssh = "${sysconfdir}/${PN}/roster"
113FILES:${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}" 113FILES:${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}"
114 114
115SUMMARY:${PN}-api = "generic, modular network access system" 115SUMMARY:${PN}-api = "generic, modular network access system"
@@ -124,11 +124,11 @@ CONFFILES:${PN}-api = "${sysconfdir}/init.d/${PN}-api"
124FILES:${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_unitdir}/${PN}-api.service" 124FILES:${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_unitdir}/${PN}-api.service"
125 125
126SUMMARY:${PN}-master = "remote manager to administer servers via salt" 126SUMMARY:${PN}-master = "remote manager to administer servers via salt"
127DESCRIPTION:${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." 127DESCRIPTION:${PN}-master = "${DESCRIPTION_COMMON} This particular package provides the salt controller."
128RDEPENDS:${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)" 128RDEPENDS:${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
129RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" 129RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
130RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" 130RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
131CONFFILES:${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" 131CONFFILES:${PN}-master = "${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master"
132RSUGGESTS:${PN}-master = "python3-git" 132RSUGGESTS:${PN}-master = "python3-git"
133FILES:${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master} ${systemd_system_unitdir}/${PN}-master.service" 133FILES:${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master} ${systemd_system_unitdir}/${PN}-master.service"
134 134
@@ -136,7 +136,7 @@ SUMMARY:${PN}-syndic = "master-of-masters for salt, the distributed remote execu
136DESCRIPTION:${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \ 136DESCRIPTION:${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \
137salt; it enables the management of multiple masters at a time." 137salt; it enables the management of multiple masters at a time."
138RDEPENDS:${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})" 138RDEPENDS:${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})"
139CONFFILES:${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic" 139CONFFILES:${PN}-syndic = "${sysconfdir}/init.d/${PN}-syndic"
140FILES:${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic} ${systemd_system_unitdir}/${PN}-syndic.service" 140FILES:${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic} ${systemd_system_unitdir}/${PN}-syndic.service"
141 141
142SUMMARY:${PN}-cloud = "public cloud VM management system" 142SUMMARY:${PN}-cloud = "public cloud VM management system"
@@ -147,7 +147,7 @@ CONFFILES:${PN}-cloud = "${sysconfdir}/${PN}/cloud"
147FILES:${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}" 147FILES:${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}"
148 148
149SUMMARY:${PN}-tests = "salt stack test suite" 149SUMMARY:${PN}-tests = "salt stack test suite"
150DESCRIPTION:${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite." 150DESCRIPTION:${PN}-tests = "${DESCRIPTION_COMMON} This particular package provides the salt unit test suite."
151RDEPENDS:${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash" 151RDEPENDS:${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash"
152FILES:${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/" 152FILES:${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/"
153 153