Juju Charms Collection
glance package

Merge lp:~gandelman-a/charms/oneiric/glance/update_interfaces into lp:charms/oneiric/glance

  1. Oneiric (11.10)
  2. update_interfaces
  3. Merge into trunk
Proposed by Adam Gandelman
Status: Needs review
Proposed branch: lp:~gandelman-a/charms/oneiric/glance/update_interfaces
Merge into: lp:charms/oneiric/glance
Diff against target: 62 lines (+8/-8)
4 files modified
config.yaml (+2/-2)
hooks/glance-common (+1/-1)
hooks/glance-relations (+4/-4)
metadata.yaml (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/charms/oneiric/glance/update_interfaces
Reviewer Review Type Date Requested Status
Adam Gandelman Pending
Review via email: mp+91750@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

13. By Adam Gandelman

metadata: update interfaces, config: use glance-db instead of nova-db

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2011-09-16 17:34:31 +0000
3+++ config.yaml 2012-02-07 01:44:20 +0000
4@@ -15,7 +15,7 @@
5 default: glance
6 type: string
7 description: Database username
8- nova-db:
9- default: nova
10+ glance-db:
11+ default: glance
12 type: string
13 description: Nova database name
14
15=== modified file 'hooks/glance-common'
16--- hooks/glance-common 2011-12-02 23:33:07 +0000
17+++ hooks/glance-common 2012-02-07 01:44:20 +0000
18@@ -5,7 +5,7 @@
19 GLANCE_API_CONF=$(config-get api-config)
20
21 DB_USER=$(config-get db-user)
22-NOVA_DB=$(config-get nova-db)
23+GLANCE_DB=$(config-get glance-db)
24 PPA=$(config-get glance-release)
25
26 HOSTNAME=`hostname -f`
27
28=== modified file 'hooks/glance-relations'
29--- hooks/glance-relations 2011-12-02 23:33:07 +0000
30+++ hooks/glance-relations 2012-02-07 01:44:20 +0000
31@@ -35,8 +35,8 @@
32 }
33
34 function db_joined {
35- juju-log "glance: db_joined: requesting access to $NOVA_DB for $DB_USER@`unit-get private-address`"
36- relation-set database=$NOVA_DB
37+ juju-log "glance: db_joined: requesting access to $GLANCE_DB for $DB_USER@`unit-get private-address`"
38+ relation-set database=$GLANCE_DB
39 relation-set username=$DB_USER
40 relation-set hostname=`unit-get private-address`
41 }
42@@ -50,8 +50,8 @@
43 else
44 echo "db_changed: Received password from $DB_HOST"
45 fi
46- juju-log "glance: db_changed: Configuring registry for access to $NOVA_DB@$DB_HOST"
47- set_or_update sql_connection "mysql://$DB_USER:$DB_PASSWORD@$DB_HOST/$NOVA_DB" registry
48+ juju-log "glance: db_changed: Configuring registry for access to $GLANCE_DB@$DB_HOST"
49+ set_or_update sql_connection "mysql://$DB_USER:$DB_PASSWORD@$DB_HOST/$GLANCE_DB" registry
50 glance_ctl all restart
51 }
52
53
54=== modified file 'metadata.yaml'
55--- metadata.yaml 2011-10-12 05:46:10 +0000
56+++ metadata.yaml 2012-02-07 01:44:20 +0000
57@@ -13,4 +13,4 @@
58 shared-db:
59 interface: mysql-shared
60 object-store:
61- interface: swift
62+ interface: swift-object-store

Subscribers

People subscribed via source and target branches

to all changes: