python-quantum: Configure postgresql credentials

The user and password for postgresql are defined in the
identity class and are loaded by the recipes from this class.

Signed-off-by: Mihai Prica <prica.mihai@gmail.com>

3 files changed, 9 insertions, 3 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini b/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini
index 13f5428..7779621 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini
+++ b/meta-openstack/recipes-devtools/python/python-quantum/linuxbridge_conf.ini
@@ -26,7 +26,7 @@
 # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
 # Replace 127.0.0.1 above with the IP address of the database used by the
 # main quantum server. (Leave it as is if the database runs on this host.)
-sql_connection = postgresql://admin:admin@localhost/quantum
+sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/quantum
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
 # sql_max_retries = 10
diff --git a/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini b/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini
index 8b46a4b..171da27 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini
+++ b/meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini
@@ -4,7 +4,7 @@
 # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
 # Replace 127.0.0.1 above with the IP address of the database used by the
 # main quantum server. (Leave it as is if the database runs on this host.)
-sql_connection = postgresql://admin:admin@localhost/quantum
+sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/quantum
 # Database reconnection retry times - in event connectivity is lost
 # set to -1 implies an infinite retry count
 # sql_max_retries = 10
diff --git a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.2.bb b/meta-openstack/recipes-devtools/python/python-quantum_2013.1.2.bb
index 357cbae..8f0fa43 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-quantum_2013.1.2.bb
@@ -34,6 +34,12 @@ do_install_append() {
     sed -e "s:^# core_plugin.*:core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2:g" \
         -i ${WORKDIR}/quantum.conf
 
+    for file in ovs_quantum_plugin.ini linuxbridge_conf.ini
+    do
+        sed -e "s:%DB_USER%:${DB_USER}:g" -i ${WORKDIR}/${file}
+        sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${WORKDIR}/${file}
+    done
+
     install -d ${QUANTUM_CONF_DIR}
     install -d ${QUANTUM_CONF_DIR}/plugins/openvswitch
     install -d ${QUANTUM_CONF_DIR}/plugins/linuxbridge
@@ -65,7 +71,7 @@ pkg_postinst_${SRCNAME} () {
        sudo -u postgres initdb -D /etc/postgresql/
        /etc/init.d/postgresql start
        sleep 0.2
-       sudo -u postgres psql -c "CREATE ROLE admin WITH SUPERUSER LOGIN PASSWORD 'admin'"
+       sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'"
     fi
 
     sudo -u postgres createdb quantum