stsstack-bundles

Merge ~hopem/stsstack-bundles:fix-ha-opt into stsstack-bundles:master

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. fix-ha-opt
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: f4a89387a819560e4a6c7a32e7b153e17941bd82
Proposed branch: ~hopem/stsstack-bundles:fix-ha-opt
Merge into: stsstack-bundles:master
Diff against target: 29 lines (+7/-11)
1 file modified
openstack/generate-bundle.sh (+7/-11)
Reviewer Review Type Date Requested Status
Mario Splivalo (community) Approve
Review via email: mp+365412@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mario Splivalo (mariosplivalo) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/openstack/generate-bundle.sh b/openstack/generate-bundle.sh
2index 06ec0ee..c34a1f9 100755
3--- a/openstack/generate-bundle.sh
4+++ b/openstack/generate-bundle.sh
5@@ -260,17 +260,13 @@ do
6 overlays+=( "vault-ceph.yaml" )
7 overlays+=( "vault-openstack.yaml" )
8 ;;
9- --ha)
10- # This is HA for services in the base bundle only.
11- overlays+=( "cinder-ha.yaml" )
12- overlays+=( "glance-ha.yaml" )
13- overlays+=( "keystone-ha.yaml" )
14- overlays+=( "neutron-api-ha.yaml" )
15- overlays+=( "nova-cloud-controller-ha.yaml" )
16- overlays+=( "memcached.yaml" )
17- overlays+=( "openstack-dashboard-ha.yaml" )
18- overlays+=( "rabbitmq-server-ha.yaml" )
19- overlays+=( "mysql-ha.yaml" )
20+ --ha*)
21+ get_units $1 __NUM_HA_UNITS__ 3
22+ units=${parameters[__NUM_HA_UNITS__]}
23+ # This is HA for "core" service apis only.
24+ set -- $@ --cinder-ha:$units --glance-ha:$units \
25+ --keystone-ha:$units --neutron-api-ha:$units \
26+ --nova-cloud-controller-ha:$units
27 ;;
28 --list-overlays)
29 list_overlays

Subscribers

People subscribed via source and target branches