Openstack Mojo Testing

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

  1. fix_stable_ssl
  2. Merge into mojo-openstack-specs
Proposed by Chris MacNaughton
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 (community) Approve
Review via email: mp+333270@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== modified file 'specs/full_stack/stable_deploy_ssl/icehouse/manifest'
--- specs/full_stack/stable_deploy_ssl/icehouse/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_ssl/icehouse/manifest 2017-11-06 16:15:05 +0000
@@ -1,9 +1,6 @@
1# Collect the charm branches from Launchpad1# Collect the charm branches from Launchpad
2collect config=collect-stable-${MOJO_SERIES}2collect config=collect-stable-${MOJO_SERIES}
33
4# Checkout stable
5script config=git_checkout_stable.py
6
7# Use juju deployer with full.yaml bundle4# Use juju deployer with full.yaml bundle
8deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse5deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
96
107
=== modified file 'specs/full_stack/stable_deploy_ssl/kilo/manifest'
--- specs/full_stack/stable_deploy_ssl/kilo/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_ssl/kilo/manifest 2017-11-06 16:15:05 +0000
@@ -1,9 +1,6 @@
1# Collect the charm branches from Launchpad1# Collect the charm branches from Launchpad
2collect config=collect-stable-${MOJO_SERIES}2collect config=collect-stable-${MOJO_SERIES}
33
4# Checkout stable
5script config=git_checkout_stable.py
6
7# Use juju deployer with full.yaml bundle4# Use juju deployer with full.yaml bundle
8deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo5deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
96
107
=== modified file 'specs/full_stack/stable_deploy_ssl/liberty/manifest'
--- specs/full_stack/stable_deploy_ssl/liberty/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_ssl/liberty/manifest 2017-11-06 16:15:05 +0000
@@ -1,9 +1,6 @@
1# Collect the charm branches from Launchpad1# Collect the charm branches from Launchpad
2collect config=collect-stable-${MOJO_SERIES}2collect config=collect-stable-${MOJO_SERIES}
33
4# Checkout stable
5script config=git_checkout_stable.py
6
7# Use juju deployer with full.yaml bundle4# Use juju deployer with full.yaml bundle
8deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty5deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
96
107
=== modified file 'specs/full_stack/stable_deploy_ssl/mitaka/manifest'
--- specs/full_stack/stable_deploy_ssl/mitaka/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_ssl/mitaka/manifest 2017-11-06 16:15:05 +0000
@@ -1,9 +1,6 @@
1# Collect the charm branches from Launchpad1# Collect the charm branches from Launchpad
2collect config=collect-stable-${MOJO_SERIES}2collect config=collect-stable-${MOJO_SERIES}
33
4# Checkout stable
5script config=git_checkout_stable.py
6
7# Use juju deployer with full.yaml bundle4# Use juju deployer with full.yaml bundle
8deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka5deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
96
107
=== modified file 'specs/full_stack/stable_deploy_ssl/newton/manifest'
--- specs/full_stack/stable_deploy_ssl/newton/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_ssl/newton/manifest 2017-11-06 16:15:05 +0000
@@ -1,9 +1,6 @@
1# Collect the charm branches from Launchpad1# Collect the charm branches from Launchpad
2collect config=collect-stable-${MOJO_SERIES}2collect config=collect-stable-${MOJO_SERIES}
33
4# Checkout stable
5script config=git_checkout_stable.py
6
7# Use juju deployer with full.yaml bundle4# Use juju deployer with full.yaml bundle
8deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-newton5deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
96
107
=== modified file 'specs/full_stack/stable_deploy_ssl/ocata/manifest'
--- specs/full_stack/stable_deploy_ssl/ocata/manifest 2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_ssl/ocata/manifest 2017-11-06 16:15:05 +0000
@@ -1,9 +1,6 @@
1# Collect the charm branches from Launchpad1# Collect the charm branches from Launchpad
2collect config=collect-stable-${MOJO_SERIES}2collect config=collect-stable-${MOJO_SERIES}
33
4# Checkout stable
5script config=git_checkout_stable.py
6
7# Use juju deployer with full.yaml bundle4# Use juju deployer with full.yaml bundle
8deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata5deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
96

Subscribers

People subscribed via source and target branches