summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools')
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican_git.bb18
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer_git.bb31
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_git.bb21
-rw-r--r--meta-openstack/recipes-devtools/python/python-glance_git.bb21
-rw-r--r--meta-openstack/recipes-devtools/python/python-heat_git.bb45
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone_git.bb50
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutron_git.bb19
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb34
-rw-r--r--meta-openstack/recipes-devtools/python/python-swift_git.bb19
9 files changed, 240 insertions, 18 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index f7eea61..308bb77 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
@@ -21,6 +21,24 @@ S = "${WORKDIR}/git"
21 21
22inherit update-rc.d setuptools identity hosts useradd default_configs 22inherit update-rc.d setuptools identity hosts useradd default_configs
23 23
24SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
25KEYSTONE_HOST="${CONTROLLER_IP}"
26
27# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
28# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
29# Parameters not in the list will be set to empty.
30
31USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
32SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
33python () {
34 flags = {'type':'keystore',\
35 'description':'Barbican Key Management Service',\
36 'publicurl':"'http://${KEYSTONE_HOST}:9311/v1'",\
37 'adminurl':"'http://${KEYSTONE_HOST}:9312/v1'",\
38 'internalurl':"'http://${KEYSTONE_HOST}:9313/v1'"}
39 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
40}
41
24do_install_append() { 42do_install_append() {
25 TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} 43 TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
26 BARBICAN_CONF_DIR=${D}${sysconfdir}/${SRCNAME} 44 BARBICAN_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index 1e6e200..ad35de2 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -20,6 +20,32 @@ S = "${WORKDIR}/git"
20 20
21CEILOMETER_SECRET ?= "12121212" 21CEILOMETER_SECRET ?= "12121212"
22 22
23SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-reseller"
24KEYSTONE_HOST="${CONTROLLER_IP}"
25
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.
28# Parameters not in the list will be set to empty.
29
30USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
31SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
32python () {
33 flags = {'type':'metering',\
34 'description':'OpenStack Metering Service',\
35 'publicurl':"'http://${KEYSTONE_HOST}:8777/'",\
36 'adminurl':"'http://${KEYSTONE_HOST}:8777/'",\
37 'internalurl':"'http://${KEYSTONE_HOST}:8777/'"}
38
39 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
40}
41
42# Add service user to service tenant as ResellerAdmin role
43USERCREATE_PARAM_${SRCNAME}-reseller = "name pass tenant role email"
44python () {
45 flags = {'role':'ResellerAdmin'}
46 d.setVarFlags("USERCREATE_PARAM_%s-reseller" % d.getVar('SRCNAME',True), flags)
47}
48
23do_configure_append() { 49do_configure_append() {
24 # We are using postgresql support, hence this requirement is not valid 50 # We are using postgresql support, hence this requirement is not valid
25 # removing it, to avoid on-target runtime issues 51 # removing it, to avoid on-target runtime issues
@@ -103,8 +129,10 @@ PACKAGES += "${SRCNAME}-setup ${SRCNAME}-common ${SRCNAME}-api"
103PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator" 129PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator"
104PACKAGES += "${SRCNAME}-agent-notification" 130PACKAGES += "${SRCNAME}-agent-notification"
105PACKAGES += "${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" 131PACKAGES += "${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller"
132PACKAGES += " ${SRCNAME}-reseller"
106 133
107ALLOW_EMPTY_${SRCNAME}-setup = "1" 134ALLOW_EMPTY_${SRCNAME}-setup = "1"
135ALLOW_EMPTY_${SRCNAME}-reseller = "1"
108 136
109FILES_${PN} = "${libdir}/*" 137FILES_${PN} = "${libdir}/*"
110 138
@@ -198,12 +226,13 @@ RDEPENDS_${PN} += " \
198 python-pysnmp \ 226 python-pysnmp \
199 " 227 "
200 228
201RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification \ 229RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification ${SRCNAME}-reseller \
202 postgresql postgresql-client python-psycopg2 tgt" 230 postgresql postgresql-client python-psycopg2 tgt"
203RDEPENDS_${SRCNAME}-api = "${SRCNAME}-controller" 231RDEPENDS_${SRCNAME}-api = "${SRCNAME}-controller"
204RDEPENDS_${SRCNAME}-collector = "${SRCNAME}-controller" 232RDEPENDS_${SRCNAME}-collector = "${SRCNAME}-controller"
205RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient libvirt" 233RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-ceilometerclient libvirt"
206RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller" 234RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-controller"
235RDEPENDS_${SRCNAME}-reseller = "postgresql sudo ${SRCNAME}-controller"
207 236
208INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller" 237INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-collector ${SRCNAME}-compute ${SRCNAME}-controller"
209INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification" 238INITSCRIPT_PACKAGES += "${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator ${SRCNAME}-agent-notification"
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 4e0be66..0a06e33 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -24,10 +24,29 @@ SRCREV="116f54dbf188a17b5e3dd966658e98bf19b8912b"
24PV="2014.2.b1+git${SRCPV}" 24PV="2014.2.b1+git${SRCPV}"
25S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
26 26
27inherit setuptools update-rc.d identity default_configs 27inherit setuptools update-rc.d identity default_configs hosts
28 28
29CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift" 29CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift"
30 30
31SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
32KEYSTONE_HOST="${CONTROLLER_IP}"
33
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.
36# Parameters not in the list will be set to empty.
37
38USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
39SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
40python () {
41 flags = {'type':'volume',\
42 'description':'OpenStack Volume Service',\
43 'publicurl':"'http://${KEYSTONE_HOST}:8776/v1/\$(tenant_id)s'",\
44 'adminurl':"'http://${KEYSTONE_HOST}:8776/v1/\$(tenant_id)s'",\
45 'internalurl':"'http://${KEYSTONE_HOST}:8776/v1/\$(tenant_id)s'"}
46
47 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
48}
49
31do_install_prepend() { 50do_install_prepend() {
32 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/conf_fixture.py 51 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/conf_fixture.py
33} 52}
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index 7aef639..ee8ff09 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -18,7 +18,7 @@ PV="2014.2.b1+git${SRCPV}"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20
21inherit setuptools update-rc.d identity default_configs 21inherit setuptools update-rc.d identity default_configs hosts
22 22
23GLANCE_DEFAULT_STORE ?= "file" 23GLANCE_DEFAULT_STORE ?= "file"
24GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\ 24GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\
@@ -28,6 +28,25 @@ GLANCE_KNOWN_STORES ?= "glance.store.rbd.Store,\
28 glance.store.http.Store" 28 glance.store.http.Store"
29 29
30 30
31SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
32KEYSTONE_HOST="${CONTROLLER_IP}"
33
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.
36# Parameters not in the list will be set to empty.
37
38USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
39SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
40python () {
41 flags = {'type':'image',\
42 'description':'OpenStack Image Service',\
43 'publicurl':"'http://${KEYSTONE_HOST}:9292/v2'",\
44 'adminurl':"'http://${KEYSTONE_HOST}:9292/v2'",\
45 'internalurl':"'http://${KEYSTONE_HOST}:9292/v2'"}
46
47 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
48}
49
31do_install_prepend() { 50do_install_prepend() {
32 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py 51 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py
33 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py 52 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/unit/base.py
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 90a456c..fd21af2 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -20,6 +20,44 @@ SRCREV="45f97e6a840bbba2a467558e60549e664496633e"
20PV="2014.2.b1+git${SRCPV}" 20PV="2014.2.b1+git${SRCPV}"
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
23SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn"
24KEYSTONE_HOST="${CONTROLLER_IP}"
25
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.
28# Parameters not in the list will be set to empty.
29
30USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
31SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
32python () {
33 flags = {'type':'orchestration',\
34 'description':'OpenStack Orchestration Service',\
35 'publicurl':"'http://${KEYSTONE_HOST}:8004/v1/\$(tenant_id)s'",\
36 'adminurl':"'http://${KEYSTONE_HOST}:8004/v1/\$(tenant_id)s'",\
37 'internalurl':"'http://${KEYSTONE_HOST}:8004/v1/\$(tenant_id)s'"}
38
39 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
40}
41
42# heat stack template user role
43USERCREATE_PARAM_${SRCNAME}-templates = "role"
44python () {
45 flags = {'role':'heat_stack_user'}
46 d.setVarFlags("USERCREATE_PARAM_%s-templates" % d.getVar('SRCNAME',True), flags)
47}
48
49# api-cfn service
50SERVICECREATE_PARAM_${SRCNAME}-cfn = "name type description region publicurl adminurl internalurl"
51python () {
52 flags = {'name':'heat-cfn',\
53 'type':'cloudformation',\
54 'description':'OpenStack Cloudformation Service',\
55 'publicurl':"'http://${KEYSTONE_HOST}:8000/v1'",\
56 'adminurl':"'http://${KEYSTONE_HOST}:8000/v1'",\
57 'internalurl':"'http://${KEYSTONE_HOST}:8000/v1'"}
58 d.setVarFlags("SERVICECREATE_PARAM_%s-cfn" % d.getVar('SRCNAME',True), flags)
59}
60
23do_install_append() { 61do_install_append() {
24 TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} 62 TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
25 HEAT_CONF_DIR=${D}${sysconfdir}/${SRCNAME} 63 HEAT_CONF_DIR=${D}${sysconfdir}/${SRCNAME}
@@ -89,8 +127,11 @@ inherit setuptools identity hosts update-rc.d default_configs
89 127
90PACKAGES += "${SRCNAME}-tests ${SRCNAME}-templates ${SRCNAME}-common ${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" 128PACKAGES += "${SRCNAME}-tests ${SRCNAME}-templates ${SRCNAME}-common ${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine"
91PACKAGES += "${SRCNAME}-setup" 129PACKAGES += "${SRCNAME}-setup"
130PACKAGES += "${SRCNAME}-cfn"
92 131
93ALLOW_EMPTY_${SRCNAME}-setup = "1" 132ALLOW_EMPTY_${SRCNAME}-setup = "1"
133ALLOW_EMPTY_${SRCNAME}-templates = "1"
134ALLOW_EMPTY_${SRCNAME}-cfn = "1"
94 135
95FILES_${PN} = "${libdir}/*" 136FILES_${PN} = "${libdir}/*"
96 137
@@ -164,10 +205,12 @@ RDEPENDS_${PN} += " \
164 python-pbr \ 205 python-pbr \
165 " 206 "
166 207
167RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt" 208RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${SRCNAME}-cfn"
168RDEPENDS_${SRCNAME}-api = "${SRCNAME}-engine" 209RDEPENDS_${SRCNAME}-api = "${SRCNAME}-engine"
169RDEPENDS_${SRCNAME}-api-cfn = "${SRCNAME}-engine" 210RDEPENDS_${SRCNAME}-api-cfn = "${SRCNAME}-engine"
170RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine" 211RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-engine"
212RDEPENDS_${SRCNAME}-templates = "postgresql sudo"
213RDEPENDS_${SRCNAME}-cfn = "postgresql sudo"
171 214
172INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine" 215INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-api-cfn ${SRCNAME}-engine"
173INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api" 216INITSCRIPT_NAME_${SRCNAME}-api = "${SRCNAME}-api"
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 7ce2548..59d2b7f 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -30,6 +30,33 @@ TOKEN_FORMAT ?= "PKI"
30 30
31LDAP_DN ?= "dc=my-domain,dc=com" 31LDAP_DN ?= "dc=my-domain,dc=com"
32 32
33SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
34KEYSTONE_HOST="${CONTROLLER_IP}"
35
36# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
37# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
38# Parameters not in the list will be set to empty.
39
40USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
41python () {
42 flags = {'name':'${ADMIN_USER}',\
43 'pass':'${ADMIN_PASSWORD}',\
44 'tenant':'${ADMIN_TENANT}',\
45 'role':'${ADMIN_ROLE}',\
46 'email':'${ADMIN_USER_EMAIL}',\
47 }
48 d.setVarFlags("USERCREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
49}
50SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
51python () {
52 flags = {'type':'identity',\
53 'description':'OpenStack Identity',\
54 'publicurl':"'http://${KEYSTONE_HOST}:5000/v2.0'",\
55 'adminurl':"'http://${KEYSTONE_HOST}:35357/v2.0'",\
56 'internalurl':"'http://${KEYSTONE_HOST}:5000/v2.0'"}
57 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
58}
59
33do_install_append() { 60do_install_append() {
34 61
35 KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone 62 KEYSTONE_CONF_DIR=${D}${sysconfdir}/keystone
@@ -40,7 +67,7 @@ do_install_append() {
40 install -d ${D}${localstatedir}/log/${SRCNAME} 67 install -d ${D}${localstatedir}/log/${SRCNAME}
41 68
42 install -m 600 ${WORKDIR}/keystone.conf ${KEYSTONE_CONF_DIR}/ 69 install -m 600 ${WORKDIR}/keystone.conf ${KEYSTONE_CONF_DIR}/
43 install -m 600 ${WORKDIR}/identity.sh ${KEYSTONE_CONF_DIR}/ 70 install -m 755 ${WORKDIR}/identity.sh ${KEYSTONE_CONF_DIR}/
44 install -m 600 ${WORKDIR}/openrc ${KEYSTONE_CONF_DIR}/ 71 install -m 600 ${WORKDIR}/openrc ${KEYSTONE_CONF_DIR}/
45 install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf 72 install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf
46 install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json 73 install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json
@@ -125,20 +152,15 @@ pkg_postinst_${SRCNAME}-setup () {
125 sleep 2 152 sleep 2
126 fi 153 fi
127 154
128 sudo -u postgres createdb keystone 155 # This is to make sure keystone is configured and running
129 keystone-manage db_sync 156 PIDFILE="/var/run/keystone-all.pid"
130 keystone-manage pki_setup --keystone-user=root --keystone-group=root 157 if [ -z `cat $PIDFILE 2>/dev/null` ]; then
158 sudo -u postgres createdb keystone
159 keystone-manage db_sync
160 keystone-manage pki_setup --keystone-user=root --keystone-group=root
131 161
132 # Create users, services and endpoints 162 /etc/init.d/keystone start
133 /etc/init.d/keystone start 163 fi
134 sleep 2
135
136 ADMIN_PASSWORD=${ADMIN_PASSWORD} \
137 SERVICE_PASSWORD=${SERVICE_PASSWORD} \
138 SERVICE_TENANT_NAME=${SERVICE_TENANT_NAME} \
139 bash /etc/keystone/identity.sh
140
141 # end python-keystone postinst
142} 164}
143 165
144# By default tokens are expired after 1 day so by default we can set 166# By default tokens are expired after 1 day so by default we can set
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index ebe76b2..8eb5788 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -27,6 +27,25 @@ S = "${WORKDIR}/git"
27 27
28inherit setuptools update-rc.d identity hosts default_configs 28inherit setuptools update-rc.d identity hosts default_configs
29 29
30SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
31KEYSTONE_HOST="${CONTROLLER_IP}"
32
33# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
34# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
35# Parameters not in the list will be set to empty.
36
37USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
38SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
39python () {
40 flags = {'type':'network',\
41 'description':'OpenStack Networking service',\
42 'publicurl':"'http://${KEYSTONE_HOST}:9696/'",\
43 'adminurl':"'http://${KEYSTONE_HOST}:9696/'",\
44 'internalurl':"'http://${KEYSTONE_HOST}:9696/'"}
45
46 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
47}
48
30do_install_append() { 49do_install_append() {
31 TEMPLATE_CONF_DIR=${S}${sysconfdir}/ 50 TEMPLATE_CONF_DIR=${S}${sysconfdir}/
32 NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron 51 NEUTRON_CONF_DIR=${D}${sysconfdir}/neutron
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 517fe99..07dac6a 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -33,6 +33,36 @@ inherit update-rc.d setuptools identity hosts useradd default_configs
33 33
34LIBVIRT_IMAGES_TYPE ?= "default" 34LIBVIRT_IMAGES_TYPE ?= "default"
35 35
36SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-ec2"
37KEYSTONE_HOST="${CONTROLLER_IP}"
38
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.
41# Parameters not in the list will be set to empty.
42
43USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
44SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
45python () {
46 flags = {'type':'compute',\
47 'description':'OpenStack Compute Service',\
48 'publicurl':"'http://${KEYSTONE_HOST}:8774/v2/\$(tenant_id)s'",\
49 'adminurl':"'http://${KEYSTONE_HOST}:8774/v2/\$(tenant_id)s'",\
50 'internalurl':"'http://${KEYSTONE_HOST}:8774/v2/\$(tenant_id)s'"}
51 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
52}
53
54# ec2 is provided by nova-api
55SERVICECREATE_PARAM_${SRCNAME}-ec2 = "name type description region publicurl adminurl internalurl"
56python () {
57 flags = {'name':'ec2',\
58 'type':'ec2',\
59 'description':'OpenStack EC2 Service',\
60 'publicurl':"'http://${KEYSTONE_HOST}:8773/services/Cloud'",\
61 'adminurl':"'http://${KEYSTONE_HOST}:8773/services/Admin'",\
62 'internalurl':"'http://${KEYSTONE_HOST}:8773/services/Cloud'"}
63 d.setVarFlags("SERVICECREATE_PARAM_%s-ec2" % d.getVar('SRCNAME',True), flags)
64}
65
36do_install_append() { 66do_install_append() {
37 if [ ! -f "${WORKDIR}/nova.conf" ]; then 67 if [ ! -f "${WORKDIR}/nova.conf" ]; then
38 return 68 return
@@ -174,6 +204,7 @@ PACKAGES += " ${SRCNAME}-scheduler"
174PACKAGES += " ${SRCNAME}-cert" 204PACKAGES += " ${SRCNAME}-cert"
175PACKAGES += " ${SRCNAME}-conductor" 205PACKAGES += " ${SRCNAME}-conductor"
176PACKAGES += " ${SRCNAME}-api" 206PACKAGES += " ${SRCNAME}-api"
207PACKAGES += " ${SRCNAME}-ec2"
177 208
178PACKAGECONFIG ?= "bash-completion" 209PACKAGECONFIG ?= "bash-completion"
179PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-bash-completion" 210PACKAGECONFIG[bash-completion] = ",,bash-completion,bash-completion python-nova-bash-completion"
@@ -183,6 +214,7 @@ FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
183 214
184 215
185ALLOW_EMPTY_${SRCNAME}-setup = "1" 216ALLOW_EMPTY_${SRCNAME}-setup = "1"
217ALLOW_EMPTY_${SRCNAME}-ec2 = "1"
186 218
187FILES_${PN} = "${libdir}/*" 219FILES_${PN} = "${libdir}/*"
188 220
@@ -278,6 +310,7 @@ RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \
278 iptables curl dnsmasq sudo procps" 310 iptables curl dnsmasq sudo procps"
279 311
280RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \ 312RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \
313 ${SRCNAME}-ec2 \
281 ${SRCNAME}-consoleauth \ 314 ${SRCNAME}-consoleauth \
282 ${SRCNAME}-novncproxy \ 315 ${SRCNAME}-novncproxy \
283 ${SRCNAME}-spicehtml5proxy \ 316 ${SRCNAME}-spicehtml5proxy \
@@ -291,6 +324,7 @@ RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common \
291RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \ 324RDEPENDS_${SRCNAME}-compute = "${PN} ${SRCNAME}-common python-oslo.messaging \
292 qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh" 325 qemu libvirt libvirt-libvirtd libvirt-python libvirt-virsh"
293RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common" 326RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}-common"
327RDEPENDS_${SRCNAME}-ec2 = "postgresql sudo ${SRCNAME}-common"
294 328
295RDEPENDS_${SRCNAME}-tests = " \ 329RDEPENDS_${SRCNAME}-tests = " \
296 python-coverage \ 330 python-coverage \
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index 7bab0bd..16f99f7 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -29,6 +29,25 @@ inherit setuptools python-dir update-rc.d hosts identity
29# filesystem of must support xattrs. e.g ext4 29# filesystem of must support xattrs. e.g ext4
30SWIFT_BACKING_FILE_SIZE ?= "2G" 30SWIFT_BACKING_FILE_SIZE ?= "2G"
31 31
32SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
33KEYSTONE_HOST="${CONTROLLER_IP}"
34
35# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
36# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
37# Parameters not in the list will be set to empty.
38
39USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
40SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
41python () {
42 flags = {'type':'object-store',\
43 'description':'OpenStack object-store',\
44 'publicurl':"'http://${KEYSTONE_HOST}:8888/v1/AUTH_\$(tenant_id)s'",\
45 'adminurl':"'http://${KEYSTONE_HOST}:8888/v1'",\
46 'internalurl':"'http://${KEYSTONE_HOST}:8888/v1/AUTH_\$(tenant_id)s'"}
47
48 d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
49}
50
32do_install_append() { 51do_install_append() {
33 SWIFT_CONF_DIR=${D}${sysconfdir}/swift 52 SWIFT_CONF_DIR=${D}${sysconfdir}/swift
34 53
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-03-19 22:04:42 +0000