Merge lp:~chris.macnaughton/openstack-mojo-specs/fix_stable_ssl into lp:openstack-mojo-specs

Proposed by Chris MacNaughton on 2017-11-06
Status: Merged
Merged at revision: 313
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/fix_stable_ssl
Merge into: lp:openstack-mojo-specs
Diff against target: 82 lines (+0/-18)
6 files modified
specs/full_stack/stable_deploy_ssl/icehouse/manifest (+0/-3)
specs/full_stack/stable_deploy_ssl/kilo/manifest (+0/-3)
specs/full_stack/stable_deploy_ssl/liberty/manifest (+0/-3)
specs/full_stack/stable_deploy_ssl/mitaka/manifest (+0/-3)
specs/full_stack/stable_deploy_ssl/newton/manifest (+0/-3)
specs/full_stack/stable_deploy_ssl/ocata/manifest (+0/-3)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/fix_stable_ssl
Reviewer Review Type Date Requested Status
David Ames 2017-11-06 Approve on 2017-11-06
Review via email: mp+333270@code.launchpad.net
To post a comment you must log in.
David Ames (thedac) wrote :

Looks good. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'specs/full_stack/stable_deploy_ssl/icehouse/manifest'
2--- specs/full_stack/stable_deploy_ssl/icehouse/manifest 2017-02-22 14:27:58 +0000
3+++ specs/full_stack/stable_deploy_ssl/icehouse/manifest 2017-11-06 16:15:05 +0000
4@@ -1,9 +1,6 @@
5 # Collect the charm branches from Launchpad
6 collect config=collect-stable-${MOJO_SERIES}
7
8-# Checkout stable
9-script config=git_checkout_stable.py
10-
11 # Use juju deployer with full.yaml bundle
12 deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
13
14
15=== modified file 'specs/full_stack/stable_deploy_ssl/kilo/manifest'
16--- specs/full_stack/stable_deploy_ssl/kilo/manifest 2017-02-22 14:27:58 +0000
17+++ specs/full_stack/stable_deploy_ssl/kilo/manifest 2017-11-06 16:15:05 +0000
18@@ -1,9 +1,6 @@
19 # Collect the charm branches from Launchpad
20 collect config=collect-stable-${MOJO_SERIES}
21
22-# Checkout stable
23-script config=git_checkout_stable.py
24-
25 # Use juju deployer with full.yaml bundle
26 deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
27
28
29=== modified file 'specs/full_stack/stable_deploy_ssl/liberty/manifest'
30--- specs/full_stack/stable_deploy_ssl/liberty/manifest 2017-02-22 14:27:58 +0000
31+++ specs/full_stack/stable_deploy_ssl/liberty/manifest 2017-11-06 16:15:05 +0000
32@@ -1,9 +1,6 @@
33 # Collect the charm branches from Launchpad
34 collect config=collect-stable-${MOJO_SERIES}
35
36-# Checkout stable
37-script config=git_checkout_stable.py
38-
39 # Use juju deployer with full.yaml bundle
40 deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
41
42
43=== modified file 'specs/full_stack/stable_deploy_ssl/mitaka/manifest'
44--- specs/full_stack/stable_deploy_ssl/mitaka/manifest 2017-02-22 14:27:58 +0000
45+++ specs/full_stack/stable_deploy_ssl/mitaka/manifest 2017-11-06 16:15:05 +0000
46@@ -1,9 +1,6 @@
47 # Collect the charm branches from Launchpad
48 collect config=collect-stable-${MOJO_SERIES}
49
50-# Checkout stable
51-script config=git_checkout_stable.py
52-
53 # Use juju deployer with full.yaml bundle
54 deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
55
56
57=== modified file 'specs/full_stack/stable_deploy_ssl/newton/manifest'
58--- specs/full_stack/stable_deploy_ssl/newton/manifest 2017-02-22 14:27:58 +0000
59+++ specs/full_stack/stable_deploy_ssl/newton/manifest 2017-11-06 16:15:05 +0000
60@@ -1,9 +1,6 @@
61 # Collect the charm branches from Launchpad
62 collect config=collect-stable-${MOJO_SERIES}
63
64-# Checkout stable
65-script config=git_checkout_stable.py
66-
67 # Use juju deployer with full.yaml bundle
68 deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
69
70
71=== modified file 'specs/full_stack/stable_deploy_ssl/ocata/manifest'
72--- specs/full_stack/stable_deploy_ssl/ocata/manifest 2017-02-22 14:27:58 +0000
73+++ specs/full_stack/stable_deploy_ssl/ocata/manifest 2017-11-06 16:15:05 +0000
74@@ -1,9 +1,6 @@
75 # Collect the charm branches from Launchpad
76 collect config=collect-stable-${MOJO_SERIES}
77
78-# Checkout stable
79-script config=git_checkout_stable.py
80-
81 # Use juju deployer with full.yaml bundle
82 deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
83

Subscribers

People subscribed via source and target branches