python-cinder: uprev to latest stable/pike

Requires the introduction of python-oauth2client and
python-google-api-python-client packages/recipes. As with other
openstack component uprev's we move some of the initialization from
the first run scripts to the cinder-init.service which is run on first
boot. This allows for someone to disable the default configuration by
not including the cinder-init package in their image.

The initialization is done following the guide at:

At this point we have cinder up and running, which we can verify using
the "openstack volume service list" command.

root@controller:~# openstack volume service list
+------------------+----------------------+------+---------+-------+----------------------------+
| Binary           | Host                 | Zone | Status  | State | Updated At                 |
+------------------+----------------------+------+---------+-------+----------------------------+
| cinder-backup    | controller           | nova | enabled | down  | 2018-04-30T15:31:08.330770 |
| cinder-volume    | controller@nfsdriver | nova | enabled | down  | 2018-04-30T15:31:10.477678 |
| cinder-scheduler | controller           | nova | enabled | down  | 2018-04-30T15:31:10.653041 |
+------------------+----------------------+------+---------+-------+----------------------------+

We will have to adjust the configuration for a compute node but at
this point we are concentrating on the initial configuration for the
controller image.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 168 insertions, 141 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index 3523038..5274698 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -6,9 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 SRCNAME = "cinder"
 
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \
+    file://cinder-init \
+    file://cinder-init.service \
+    file://cinder-api.service \
+    file://cinder-backup.service \
+    file://cinder-scheduler.service \
+    file://cinder-volume.service \
     file://cinder.conf \
-    file://cinder.init \
     file://cinder-volume \
     file://nfs_setup.sh \
     file://glusterfs_setup.sh \
@@ -16,41 +21,22 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
     file://add-cinder-volume-types.sh \
     "
 
-# file://0001-run_tests-respect-tools-dir.patch
-# file://fix_cinder_memory_leak.patch 
-# file://cinder-builtin-tests-config-location.patch
-
-SRCREV = "61026d4e4f2a58dd84ffb2e4e40ab99860b9316a"
-PV = "7.0.0+git${SRCPV}"
+SRCREV = "4fb3a702ba8c3de24c41a6f706597bfa81e60435"
+PV = "11.1.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-inherit setuptools update-rc.d identity default_configs hosts monitor
-
-CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift"
-
-SERVICECREATE_PACKAGES = "${SRCNAME}-setup"
-KEYSTONE_HOST="${CONTROLLER_IP}"
+inherit setuptools systemd useradd identity default_configs hosts monitor
 
-# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set.
-# If the flag for a parameter in the list is not set here, the default value will be given to that parameter.
-# Parameters not in the list will be set to empty.
+USER = "cinder"
+GROUP = "cinder"
 
-USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email"
-SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl"
-python () {
-    flags = {'type':'volume',\
-             'description':'OpenStack Volume Service',\
-             'publicurl':"'http://${KEYSTONE_HOST}:8776/v1/\$(tenant_id)s'",\
-             'adminurl':"'http://${KEYSTONE_HOST}:8776/v1/\$(tenant_id)s'",\
-             'internalurl':"'http://${KEYSTONE_HOST}:8776/v1/\$(tenant_id)s'"}
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system ${GROUP}"
+USERADD_PARAM_${PN} = "--system -m -d ${localstatedir}/lib/cinder -s /bin/false -g ${GROUP} ${USER}"
 
-    d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags)
-}
-SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
+CINDER_BACKUP_BACKEND_DRIVER ?= "cinder.backup.drivers.swift"
 
-#do_install_prepend() {
-#    sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/conf_fixture.py
-#}
+KEYSTONE_HOST="${CONTROLLER_IP}"
 
 CINDER_LVM_VOLUME_BACKING_FILE_SIZE ?= "2G"
 CINDER_NFS_VOLUME_SERVERS_DEFAULT = "controller:/etc/cinder/nfs_volumes"
@@ -65,9 +51,9 @@ do_install_append() {
     #Instead of substituting api-paste.ini from the WORKDIR,
     #move it over to the image's directory and do the substitution there
     install -d ${CINDER_CONF_DIR}
-    install -m 600 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/
-    install -m 600 ${TEMPLATE_CONF_DIR}/api-paste.ini ${CINDER_CONF_DIR}/
-    install -m 600 ${S}/etc/cinder/policy.json ${CINDER_CONF_DIR}/
+    install -o ${USER} -m 664 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/
+    install -o ${USER} -m 664 ${TEMPLATE_CONF_DIR}/api-paste.ini ${CINDER_CONF_DIR}/
+    install -o ${USER} -m 664 ${S}/etc/cinder/policy.json ${CINDER_CONF_DIR}/
 
     install -d ${CINDER_CONF_DIR}/drivers
     install -m 600 ${WORKDIR}/nfs_setup.sh ${CINDER_CONF_DIR}/drivers/
@@ -76,33 +62,62 @@ do_install_append() {
     install -m 700 ${WORKDIR}/add-cinder-volume-types.sh ${CINDER_CONF_DIR}/
 
     install -d ${D}${localstatedir}/log/${SRCNAME}
-    
-    for file in api-paste.ini cinder.conf; do
-        sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" \
-            -i ${CINDER_CONF_DIR}/$file
-        sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${CINDER_CONF_DIR}/$file
-        sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" \
-            -i ${CINDER_CONF_DIR}/$file
-
-        sed -e "s:%DB_USER%:${DB_USER}:g" -i ${CINDER_CONF_DIR}/$file
-        sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${CINDER_CONF_DIR}/$file
-        sed -e "s:%CINDER_BACKUP_BACKEND_DRIVER%:${CINDER_BACKUP_BACKEND_DRIVER}:g" \
-        -i ${CINDER_CONF_DIR}/$file
+
+    # Setup the neutron initialization script
+    INIT_FILE=${CINDER_CONF_DIR}/cinder-init
+    install -g ${USER} -m 750 ${WORKDIR}/cinder-init ${INIT_FILE}
+    sed -e "s:%DB_USER%:${DB_USER}:g" -i ${INIT_FILE}
+    sed -e "s:%CINDER_USER%:${USER}:g" -i ${INIT_FILE}
+    sed -e "s:%CINDER_GROUP%:${GROUP}:g" -i ${INIT_FILE}
+    sed -e "s:%CONTROLLER_IP%:${CONTROLLER_IP}:g" -i ${INIT_FILE}
+    sed -e "s:%ADMIN_USER%:${ADMIN_USER}:g" -i ${INIT_FILE}
+    sed -e "s:%ADMIN_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${INIT_FILE}
+    sed -e "s:%ADMIN_ROLE%:${ADMIN_ROLE}:g" -i ${INIT_FILE}
+    sed -e "s:%SYSCONFDIR%:${sysconfdir}:g" -i ${INIT_FILE}
+    sed -e "s:%ROOT_HOME%:${ROOT_HOME}:g" -i ${INIT_FILE}
+
+    # install systemd service files
+    install -d ${D}${systemd_system_unitdir}/
+    for j in cinder-init cinder-api cinder-backup cinder-volume cinder-scheduler; do
+        SERVICE_FILE=${D}${systemd_system_unitdir}/$j.service
+        install -m 644 ${WORKDIR}/$j.service ${SERVICE_FILE}
+        sed -e "s:%USER%:${USER}:g" -i ${SERVICE_FILE}
+        sed -e "s:%GROUP%:${GROUP}:g" -i ${SERVICE_FILE}
+        sed -e "s:%LOCALSTATEDIR%:${localstatedir}:g" -i ${SERVICE_FILE}
+        sed -e "s:%SYSCONFDIR%:${sysconfdir}:g" -i ${SERVICE_FILE}                      
     done
 
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-        install -d ${D}${sysconfdir}/init.d
-        sed 's:@suffix@:api:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-api.init.sh
-        install -m 0755 ${WORKDIR}/cinder-api.init.sh ${D}${sysconfdir}/init.d/cinder-api
-        sed 's:@suffix@:scheduler:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-scheduler.init.sh
-        install -m 0755 ${WORKDIR}/cinder-scheduler.init.sh ${D}${sysconfdir}/init.d/cinder-scheduler
-        sed 's:@suffix@:backup:' < ${WORKDIR}/cinder.init >${WORKDIR}/cinder-backup.init.sh
-        install -m 0755 ${WORKDIR}/cinder-backup.init.sh ${D}${sysconfdir}/init.d/cinder-backup
-        install -m 0755 ${WORKDIR}/cinder-volume ${D}${sysconfdir}/init.d/cinder-volume
-    fi
+    #
+    # Per https://docs.openstack.org/cinder/pike/install/cinder-controller-install-ubuntu.html
+    #
+    CONF_FILE="${CINDER_CONF_DIR}/cinder.conf"
+    sed -e "/^\[database\]/aconnection = postgresql+psycopg2://${DB_USER}:${DB_PASSWORD}@${CONTROLLER_IP}/cinder" \
+           -i ${CONF_FILE}
+    sed -e "/#transport_url =/atransport_url = rabbit://openstack:${ADMIN_PASSWORD}@${CONTROLLER_IP}" -i ${CONF_FILE}
+    sed -e "/#auth_strategy =/aauth_strategy = keystone" -i ${CONF_FILE}
+
+    str="auth_uri = http://${CONTROLLER_IP}:5000"
+    str="$str\nauth_url = http://${CONTROLLER_IP}:35357"
+    str="$str\nmemcached_servers = ${CONTROLLER_IP}:11211"
+    str="$str\nauth_type = password"
+    str="$str\nproject_domain_name = Default"
+    str="$str\nuser_domain_name = Default"
+    str="$str\nproject_name = service"
+    str="$str\nusername = ${USER}"
+    str="$str\npassword = ${ADMIN_PASSWORD}"
+    sed -e "/^\[keystone_authtoken\].*/a$str" -i ${CONF_FILE}
+
+    sed -e "/#my_ip =/amy_ip = ${MY_IP}" -i ${CONF_FILE}
+    sed -e "/#lock_path =/alock_path = ${localstatedir}/lib/cinder/tmp" -i ${CONF_FILE}
+
+    sed -e "/#enabled_backends =/aenabled_backends = nfsdriver" -i ${CONF_FILE}
+    str="[nfsdriver]"
+    str="$str\nvolume_group=nfs-group-1"
+    str="$str\nvolume_driver=cinder.volume.drivers.nfs.NfsDriver"
+    str="$str\nvolume_backend_name=Generic_NFS"
+    sed -e "s/\(^\[backend\].*\)/$str\n\1/" -i ${CONF_FILE}
 
     # test setup
-    cp run_tests.sh ${CINDER_CONF_DIR}
     cp -r tools ${CINDER_CONF_DIR}
 
     #Create cinder volume group backing file
@@ -123,32 +138,26 @@ do_install_append() {
     sed -e "s:%IS_DEFAULT%:${is_default}:g" -i ${D}/etc/cinder/drivers/glusterfs_setup.sh
 }
 
-pkg_postinst_${SRCNAME}-setup () {
-    if [ -z "$D" ]; then
-         # This is to make sure postgres is configured and running
-         if ! pidof postmaster > /dev/null; then
-            /etc/init.d/postgresql-init
-            /etc/init.d/postgresql start
-         fi
-
-         if [ ! -d /var/log/cinder ]; then
-            mkdir /var/log/cinder
-         fi
-
-         sudo -u postgres createdb cinder
-         cinder-manage db sync
-
-         # Create Cinder nfs_share config file with default nfs server
-         if [ ! -f /etc/cinder/nfs_shares ]; then
-             /bin/bash /etc/cinder/drivers/nfs_setup.sh
-         fi
-
-         # Create Cinder glusterfs_share config file with default glusterfs server
-         if [ ! -f /etc/cinder/glusterfs_shares ] && [ -f /usr/sbin/glusterfsd ]; then
-             /bin/bash /etc/cinder/drivers/glusterfs_setup.sh
-         fi
-    fi
-}
+#pkg_postinst_${SRCNAME}-setup () {
+#    if [ -z "$D" ]; then
+#        if [ ! -d /var/log/cinder ]; then
+#           mkdir /var/log/cinder
+#        fi
+#
+#        sudo -u postgres createdb cinder
+#        cinder-manage db sync
+#
+#        # Create Cinder nfs_share config file with default nfs server
+#        if [ ! -f /etc/cinder/nfs_shares ]; then
+#            /bin/bash /etc/cinder/drivers/nfs_setup.sh
+#        fi
+#
+#        # Create Cinder glusterfs_share config file with default glusterfs server
+#        if [ ! -f /etc/cinder/glusterfs_shares ] && [ -f /usr/sbin/glusterfsd ]; then
+#            /bin/bash /etc/cinder/drivers/glusterfs_setup.sh
+#        fi
+#    fi
+#}
 
 PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup"
 ALLOW_EMPTY_${SRCNAME}-setup = "1"
@@ -161,20 +170,23 @@ RDEPENDS_${SRCNAME}-tests += " bash python"
 
 FILES_${PN} = "${libdir}/* /etc/tgt"
 
-FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/run_tests.sh \
-                          ${sysconfdir}/${SRCNAME}/tools"
+FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tools"
 
-FILES_${SRCNAME}-api = "${bindir}/cinder-api \
-    ${sysconfdir}/init.d/cinder-api"
+FILES_${SRCNAME}-api = " \
+    ${bindir}/cinder-api \
+"
 
-FILES_${SRCNAME}-volume = "${bindir}/cinder-volume \
-    ${sysconfdir}/init.d/cinder-volume"
+FILES_${SRCNAME}-volume = " \
+    ${bindir}/cinder-volume \
+"
 
-FILES_${SRCNAME}-scheduler = "${bindir}/cinder-scheduler \
-    ${sysconfdir}/init.d/cinder-scheduler"
+FILES_${SRCNAME}-scheduler = " \
+    ${bindir}/cinder-scheduler \
+"
 
-FILES_${SRCNAME}-backup = "${bindir}/cinder-backup \
-    ${sysconfdir}/init.d/cinder-backup"
+FILES_${SRCNAME}-backup = " \
+    ${bindir}/cinder-backup \
+"
 
 FILES_${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
@@ -187,32 +199,21 @@ DEPENDS += " \
         python-pbr \
         "
 
-RDEPENDS_${PN} += "lvm2 \
-    python-sqlalchemy \
-        python-amqplib \
-        python-anyjson \
-        python-eventlet \
-        python-kombu \
-        python-lxml \
-        python-routes \
-        python-webob \
-        python-greenlet \
-        python-lockfile \
-        python-pastedeploy \
-        python-paste \
-        python-sqlalchemy-migrate \
-        python-stevedore \
-        python-suds-jurko \
-        python-paramiko \
-        python-babel \
-        python-iso8601 \
-        python-setuptools-git \
-        python-glanceclient \
-        python-keystoneclient \
-        python-swiftclient \
-        python-cinderclient \
-        python-oslo.config \
-        python-oslo.rootwrap \
+RDEPENDS_${PN} += " \
+        lvm2 \
+        python-pbr \
+        python-babel \
+        python-decorator \
+        python-eventlet \
+        python-greenlet \
+        python-httplib2 \
+        python-iso8601 \
+        python-ipaddress \
+        python-keystoneauth1 \
+        python-keystonemiddleware \
+        python-lxml \
+        python-oauth2client \
+        python-oslo.config \
         python-oslo.concurrency \
         python-oslo.context \
         python-oslo.db \
@@ -220,52 +221,78 @@ RDEPENDS_${PN} += "lvm2 \
         python-oslo.messaging \
         python-oslo.middleware \
         python-oslo.policy \
+        python-oslo.privsep \
         python-oslo.reports \
+        python-oslo.rootwrap \
         python-oslo.serialization \
         python-oslo.service \
         python-oslo.utils \
         python-oslo.versionedobjects \
-        python-pbr \
-        python-taskflow \
-        python-rtslib-fb \
-        python-keystonemiddleware \
-        python-netaddr \
         python-osprofiler \
-        python-pycrypto \
+        python-paramiko \
+        python-paste \
+        python-pastedeploy \
+        python-psutil \
         python-pyparsing \
         python-barbicanclient \
         python-glanceclient \
+        python-keystoneclient \
         python-novaclient \
         python-swiftclient \
+        python-pytz \
         python-requests \
         python-retrying \
+        python-routes \
         python-taskflow \
         python-rtslib-fb \
+        python-simplejson \
         python-six \
+        python-sqlalchemy \
+        python-sqlalchemy-migrate \
+        python-stevedore \
+        python-suds-jurko \
+        python-webob \
         python-oslo.i18n \
         python-oslo.vmware \
         python-os-brick \
-        python-enum34 \
-        python-routes \
-        "
+        python-os-win \
+        python-tooz \
+        python-google-api-python-client \
+        python-castellan \
+        python-cryptography \
+        "
 
-RDEPENDS_${SRCNAME} = "${PN} \
-        postgresql postgresql-client python-psycopg2 tgt"
+RDEPENDS_${SRCNAME} = " \
+    ${PN} \
+    postgresql \
+    postgresql-client \
+    python-psycopg2 \
+    tgt"
 
 RDEPENDS_${SRCNAME}-api = "${SRCNAME}"
 RDEPENDS_${SRCNAME}-volume = "${SRCNAME}"
 RDEPENDS_${SRCNAME}-scheduler = "${SRCNAME}"
-RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME}"
-
-INITSCRIPT_PACKAGES = "${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler ${SRCNAME}-backup"
-INITSCRIPT_NAME_${SRCNAME}-api = "cinder-api"
-INITSCRIPT_PARAMS_${SRCNAME}-api = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-volume = "cinder-volume"
-INITSCRIPT_PARAMS_${SRCNAME}-volume = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-scheduler = "cinder-scheduler"
-INITSCRIPT_PARAMS_${SRCNAME}-scheduler = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
-INITSCRIPT_NAME_${SRCNAME}-backup = "cinder-backup"
-INITSCRIPT_PARAMS_${SRCNAME}-backup = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
+RDEPENDS_${SRCNAME}-setup = "postgresql sudo ${SRCNAME} bash"
+
+SYSTEMD_PACKAGES = " \
+    ${SRCNAME}-setup \
+    ${SRCNAME}-api \
+    ${SRCNAME}-volume \
+    ${SRCNAME}-scheduler \
+    ${SRCNAME}-backup \
+"
+
+SYSTEMD_SERVICE_${SRCNAME}-setup = "cinder-init.service"
+SYSTEMD_SERVICE_${SRCNAME}-api = "cinder-api.service"
+SYSTEMD_SERVICE_${SRCNAME}-volume = "cinder-volume.service"
+SYSTEMD_SERVICE_${SRCNAME}-scheduler = "cinder-scheduler.service"
+SYSTEMD_SERVICE_${SRCNAME}-backup = "cinder-backup.service"
+
+# Disable until they are configured (via -setup)
+SYSTEMD_AUTO_ENABLE_${SRCNAME}-api = "disable"
+SYSTEMD_AUTO_ENABLE_${SRCNAME}-volume = "disable"
+SYSTEMD_AUTO_ENABLE_${SRCNAME}-scheduler = "disable"
+SYSTEMD_AUTO_ENABLE_${SRCNAME}-backup = "disable"
 
 MONITOR_SERVICE_PACKAGES = "${SRCNAME}"
 MONITOR_SERVICE_${SRCNAME} = "cinder"