Use RFC 1738 format for redis db connection
Change-Id: I7568bc46d3b28fefa56efc3c6943066268ffa61d
This commit is contained in:
parent
f7a91ede6a
commit
533b4a4580
6
.config
6
.config
@ -1,7 +1,3 @@
|
|||||||
redis:
|
redis: redis://localhost:6379/1
|
||||||
host: localhost
|
|
||||||
port: '6379'
|
|
||||||
|
|
||||||
|
|
||||||
solar_db: sqlite:////tmp/solar.db
|
solar_db: sqlite:////tmp/solar.db
|
||||||
# solar_db: riak://10.0.0.2:8087
|
# solar_db: riak://10.0.0.2:8087
|
||||||
|
@ -41,6 +41,11 @@
|
|||||||
line: "solar_db: riak://10.0.0.2:8087"
|
line: "solar_db: riak://10.0.0.2:8087"
|
||||||
state: present
|
state: present
|
||||||
create: yes
|
create: yes
|
||||||
|
- lineinfile:
|
||||||
|
dest: /home/vagrant/.solar_config_override
|
||||||
|
line: "redis: redis://10.0.0.2:6379/1"
|
||||||
|
state: present
|
||||||
|
create: yes
|
||||||
|
|
||||||
- hosts: all
|
- hosts: all
|
||||||
tasks:
|
tasks:
|
||||||
|
@ -23,7 +23,7 @@ import yaml
|
|||||||
CWD = os.getcwd()
|
CWD = os.getcwd()
|
||||||
|
|
||||||
C = Bunch(solar_db="")
|
C = Bunch(solar_db="")
|
||||||
C.redis = Bunch(port='6379', host='10.0.0.2')
|
C.redis = 'redis://localhost:6379/1'
|
||||||
|
|
||||||
|
|
||||||
def _lookup_vals(setter, config, prefix=None):
|
def _lookup_vals(setter, config, prefix=None):
|
||||||
|
@ -15,8 +15,10 @@
|
|||||||
from celery import Celery
|
from celery import Celery
|
||||||
|
|
||||||
from solar.config import C
|
from solar.config import C
|
||||||
|
from solar.utils import parse_database_conn
|
||||||
|
|
||||||
_url = 'redis://{}:{}/1'.format(C.redis.host, C.redis.port)
|
conn, _ = parse_database_conn(C.redis)
|
||||||
|
_url = 'redis://{}:{}/{}'.format(conn.host, conn.port, conn.database)
|
||||||
|
|
||||||
app = Celery(
|
app = Celery(
|
||||||
include=['solar.system_log.tasks', 'solar.orchestration.tasks'],
|
include=['solar.system_log.tasks', 'solar.orchestration.tasks'],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user