stsstack-bundles

Merge ~nicolasbock/stsstack-bundles:octavia into stsstack-bundles:master

  1. Git
  2. lp:~nicolasbock/stsstack-bundles
  3. octavia
  4. Merge into master
Proposed by Nicolas Bock
Status: Merged
Merged at revision: 7fb96cc7a70e6d192d49a0a644046c751172e1d5
Proposed branch: ~nicolasbock/stsstack-bundles:octavia
Merge into: stsstack-bundles:master
Diff against target: 13 lines (+1/-1)
1 file modified
overlays/octavia.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Review via email: mp+396392@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/overlays/octavia.yaml b/overlays/octavia.yaml
2index 362501d..0baf07e 100644
3--- a/overlays/octavia.yaml
4+++ b/overlays/octavia.yaml
5@@ -9,7 +9,7 @@ applications:
6 constraints: mem=2G
7 options:
8 debug: *debug
9- openstack-origin: __OS_ORIGIN__
10+ openstack-origin: *openstack_origin
11 amp-ssh-key-name: amphora-backdoor
12 amp-ssh-pub-key: '__AMPHORA_SSH_PUB_KEY__'
13 relations:

Subscribers

People subscribed via source and target branches