← Back to branch summary

~gandelman-a/charms/precise/nova-cloud-controller/vmw

« back to all changes in this revision

Viewing changes to hooks/nova-cloud-controller-relations

  • Committer: Adam Gandelman
  • Date: 2012-04-14 00:17:02 UTC
  • Revision ID: adamg@canonical.com-20120414001702-x1ybgxck4n2h7yvd
Also register the s3/object-store endpoint with keystone

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/nova-cloud-controller-relations
34
34
  open-port 8774
35
35
  # volume
36
36
  open-port 8776
 
37
  # object-store / s3
 
38
  open-port 3333
37
39
 
38
40
  nova_ctl all stop
39
41
}
114
116
  nova_url="http://$(unit-get private-address):8774/v1.1/\$(tenant_id)s"
115
117
  nova_vol_url="http://$(unit-get private-address):8776/v1/\$(tenant_id)s"
116
118
  ec2_url="http://$(unit-get private-address):8773/services/Cloud"
 
119
  s3_url="http://$(unit-get private-address):3333"
117
120
  relation-set nova_service="nova" \
118
121
    nova_region="RegionOne" \
119
122
    nova_public_url="$nova_url" \
128
131
    ec2_region="RegionOne" \
129
132
    ec2_public_url="$ec2_url" \
130
133
    ec2_admin_url="$ec2_url" \
131
 
    ec2_internal_url="$ec2_url"
 
134
    ec2_internal_url="$ec2_url" \
 
135
    s3_service="s3" \
 
136
    s3_region="RegionOne" \
 
137
    s3_public_url="$s3_url" \
 
138
    s3_admin_url="$s3_url" \
 
139
    s3_internal_url="$s3_url"
132
140
}
133
141
 
134
142
function keystone_changed {