summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python')
-rw-r--r--meta-openstack/recipes-devtools/python/python-quantum/ovs_quantum_plugin.ini5
-rw-r--r--meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb4
2 files changed, 6 insertions, 3 deletions
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 7f62c06..0981afe 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,10 @@
4# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum 4# sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
5# Replace 127.0.0.1 above with the IP address of the database used by the 5# Replace 127.0.0.1 above with the IP address of the database used by the
6# main quantum server. (Leave it as is if the database runs on this host.) 6# main quantum server. (Leave it as is if the database runs on this host.)
7sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/ovs_quantum 7
8# configs with listening issues, may need to use the localhost version
9# sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/ovs_quantum
10sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/ovs_quantum
8# Database reconnection retry times - in event connectivity is lost 11# Database reconnection retry times - in event connectivity is lost
9# set to -1 implies an infinite retry count 12# set to -1 implies an infinite retry count
10# sql_max_retries = 10 13# sql_max_retries = 10
diff --git a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb
index 70094f1..34da3c9 100644
--- a/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-quantum_2013.1.3.bb
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "79e60ec1aef800da3a4e1841909cdd8b2cf645979d08f27bc481957c79
20 20
21S = "${WORKDIR}/${SRCNAME}-${PV}" 21S = "${WORKDIR}/${SRCNAME}-${PV}"
22 22
23inherit setuptools update-rc.d identity 23inherit setuptools update-rc.d identity hosts
24 24
25do_install_append() { 25do_install_append() {
26 TEMPLATE_CONF_DIR=${S}${sysconfdir}/ 26 TEMPLATE_CONF_DIR=${S}${sysconfdir}/
@@ -34,7 +34,7 @@ do_install_append() {
34 sed -e "s:^# core_plugin.*:core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2:g" \ 34 sed -e "s:^# core_plugin.*:core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2:g" \
35 -i ${WORKDIR}/quantum.conf 35 -i ${WORKDIR}/quantum.conf
36 36
37 echo "rabbit_host = ${CONTROLLER_EXTERNAL_IP}" >> ${WORKDIR}/quantum.conf 37 echo "rabbit_host = ${CONTROLLER_IP}" >> ${WORKDIR}/quantum.conf
38 38
39 for file in ovs_quantum_plugin.ini linuxbridge_conf.ini 39 for file in ovs_quantum_plugin.ini linuxbridge_conf.ini
40 do 40 do