stsstack-bundles

Merge ~hopem/stsstack-bundles:cleanup-post-deployments-messages into stsstack-bundles:master

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. cleanup-post-deployments-messages
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: f49e4d9376a5df7f0f62432d8ad785fe3f070df6
Proposed branch: ~hopem/stsstack-bundles:cleanup-post-deployments-messages
Merge into: stsstack-bundles:master
Diff against target: 496 lines (+80/-44)
24 files modified
ceph/configure (+1/-0)
ceph/pipeline/00setup (+4/-1)
ceph/pipeline/02configure (+5/-6)
ceph/pipeline/03build (+2/-0)
common/helpers (+8/-5)
kubernetes/pipeline/00setup (+3/-1)
kubernetes/pipeline/02configure (+5/-6)
kubernetes/pipeline/03build (+2/-0)
landscape/configure (+1/-1)
landscape/pipeline/00setup (+3/-1)
landscape/pipeline/02configure (+1/-2)
landscape/pipeline/03build (+2/-0)
openstack/configure (+1/-1)
openstack/pipeline/00setup (+3/-1)
openstack/pipeline/02configure (+19/-11)
openstack/pipeline/03build (+2/-0)
osm/configure (+1/-1)
osm/pipeline/00setup (+3/-1)
osm/pipeline/02configure (+2/-1)
osm/pipeline/03build (+2/-0)
swift/configure (+1/-0)
swift/pipeline/00setup (+3/-1)
swift/pipeline/02configure (+4/-4)
swift/pipeline/03build (+2/-0)
Reviewer Review Type Date Requested Status
Ponnuvel Palaniyappan (community) Approve
Heather Lemon (community) Approve
Jolly Bundlers Pending
Review via email: mp+391609@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Heather Lemon (hypothetical-lemon) wrote :

+1

review: Approve
Revision history for this message
Ponnuvel Palaniyappan (pponnuvel) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ceph/configure b/ceph/configure
2new file mode 100755
3index 0000000..f0b4638
4--- /dev/null
5+++ b/ceph/configure
6@@ -0,0 +1 @@
7+#!/bin/bash -u
8diff --git a/ceph/pipeline/00setup b/ceph/pipeline/00setup
9index 0700491..c3e9b8b 100644
10--- a/ceph/pipeline/00setup
11+++ b/ceph/pipeline/00setup
12@@ -11,7 +11,9 @@ export MOD_SSL_STATE_DIR=${MOD_NAME}
13 export -a MOD_PASSTHROUGH_OPTS=()
14
15 # Collection of messages to display at the end
16-export -a MOD_MSGS=()
17+export -A MOD_MSGS=()
18+# Use order 0 to ensure this is first displayed
19+MOD_MSGS[0_common.0]="run ./configure to initialise your deployment"
20
21 # Array list of overlays to use with this deployment.
22 export -a MOD_OVERLAYS=()
23@@ -25,3 +27,4 @@ export -A APP_RELEASE_NAMES=( [firefly]=icehouse
24 [mimic]=rocky
25 [nautilus]=train
26 [octopus]=ussuri )
27+
28diff --git a/ceph/pipeline/02configure b/ceph/pipeline/02configure
29index 2cb6729..7e5c214 100644
30--- a/ceph/pipeline/02configure
31+++ b/ceph/pipeline/02configure
32@@ -1,4 +1,4 @@
33-#!/bin/bash -eu
34+#!/bin/bash
35 # Global variables are first defined in 00setup and module
36 # dependencies are defined in 01import-config-defaults
37 #
38@@ -35,9 +35,9 @@ do
39 --lma)
40 # Logging Monitoring and Analysis
41 MOD_OVERLAYS+=( "graylog.yaml ")
42- MOD_MSGS+=( "NOTE: you will need to manually relate graylog (filebeat) to any services you want to monitor" )
43 MOD_OVERLAYS+=( "grafana.yaml ")
44- MOD_MSGS+=( "NOTE: you will need to manually relate grafana (telegraf) to any services you want to monitor" )
45+ MOD_MSGS[lma.0]="need to manually relate filebeat (graylog) to any services you want to monitor"
46+ MOD_MSGS[lma.1]="need to manually relate telegraf (grafana) to any services you want to monitor"
47 ;;
48 --num-mons|--num-ceph-mons) #__OPT__type:<int>
49 MOD_PARAMS[__NUM_CEPH_MON_UNITS__]=$2
50@@ -94,8 +94,8 @@ do
51 --ceph-proxy)
52 MOD_PARAMS[__CEPH_INTERFACE__]='ceph-proxy'
53 MOD_OVERLAYS+=( "ceph-proxy.yaml" )
54- MOD_MSGS+=("NOTE: once ceph has finished deploying do the following: juju config admin-key=<key> fsid=<fsid> monitor-hosts=<mon-addr-list>'")
55- MOD_MSGS+=( "Example: juju config ceph-proxy admin-key=AQALEzleKLCNDBAAxrOY8WbxF2B7lDx0TaswGA== fsid=e5e6aee2-4719-11ea-8264-fa163e50d5d1 monitor-hosts='10.5.0.11:6789 10.5.0.12:6789 10.5.0.13:6789'" )
56+ MOD_MSGS[ceph-proxy.0]="once ceph is ready, do 'juju config admin-key=<key> fsid=<fsid> monitor-hosts=<mon-addr-list>'"
57+ MOD_MSGS[ceph-proxy.1]="e.g. juju config ceph-proxy admin-key=AQALEzleKLCNDBAAxrOY8WbxF2B7lDx0TaswGA== fsid=e5e6aee2-4719-11ea-8264-fa163e50d5d1 monitor-hosts='10.5.0.11:6789 10.5.0.12:6789 10.5.0.13:6789'"
58 ;;
59 --ceph-fs)
60 assert_min_release ocata "ceph-mds"
61@@ -129,4 +129,3 @@ target=${series}-${release}
62 target=$target/$app_release_name
63 MOD_PASSTHROUGH_OPTS+=( --release-name $target )
64
65-print_msgs
66diff --git a/ceph/pipeline/03build b/ceph/pipeline/03build
67index 8bd40d9..c432741 100644
68--- a/ceph/pipeline/03build
69+++ b/ceph/pipeline/03build
70@@ -13,6 +13,8 @@ fi
71
72 . $MOD_DIR/common/generate_bundle_base
73
74+print_msgs
75+
76 for f in $INTERNAL_BUNDLE_CONFIG_RENDERER $INTERNAL_BUNDLE_CONFIG; do
77 [ -n "$f" ] && [ -r "$f" ] && rm -f $f
78 done
79diff --git a/common/helpers b/common/helpers
80index 030efe4..3654fdd 100644
81--- a/common/helpers
82+++ b/common/helpers
83@@ -718,13 +718,16 @@ fi
84 print_msgs ()
85 {
86 if ((${#MOD_MSGS[@]})); then
87- echo ""
88- for m in "${MOD_MSGS[@]}"; do
89- echo -e "$m"
90+ echo -e "\nPost-Deployment Info/Actions:"
91+ prev_key=""
92+ for key in `echo ${!MOD_MSGS[@]}| tr -s ' ' '\n'| sort`; do
93+ msg=${MOD_MSGS[$key]}
94+ key=${key##*_} # strip order
95+ key=${key%%.*} # strip index
96+ [ "$prev_key" = "$key" ] || echo -e "\n[$key]"; prev_key=$key
97+ echo -e " - $msg"
98 done
99 echo ""
100- read -p "Hit [ENTER] to continue"
101- echo ""
102 fi
103 }
104
105diff --git a/kubernetes/pipeline/00setup b/kubernetes/pipeline/00setup
106index 40d3631..4952e03 100644
107--- a/kubernetes/pipeline/00setup
108+++ b/kubernetes/pipeline/00setup
109@@ -11,7 +11,9 @@ export MOD_SSL_STATE_DIR=${MOD_NAME}
110 export -a MOD_PASSTHROUGH_OPTS=()
111
112 # Collection of messages to display at the end
113-export -a MOD_MSGS=()
114+export -A MOD_MSGS=()
115+# Use order 0 to ensure this is first displayed
116+MOD_MSGS[0_common.0]="run ./configure to initialise your deployment"
117
118 # Array list of overlays to use with this deployment.
119 export -a MOD_OVERLAYS=()
120diff --git a/kubernetes/pipeline/02configure b/kubernetes/pipeline/02configure
121index 85664e6..91bdea0 100644
122--- a/kubernetes/pipeline/02configure
123+++ b/kubernetes/pipeline/02configure
124@@ -1,4 +1,4 @@
125-#!/bin/bash -eu
126+#!/bin/bash
127 # Global variables are first defined in 00setup and module
128 # dependencies are defined in 01import-config-defaults
129 #
130@@ -18,7 +18,7 @@ check_hacluster_channel ()
131 [ -n "$channel" ] || channel="${MASTER_OPTS[CHARM_CHANNEL]}"
132 if [ -n "$channel" ] && [ "$channel" != "stable" ]; then
133 # NOTE(dosaboy): https://bugs.launchpad.net/juju/+bug/1832873
134- MOD_MSGS+=( "\nIMPORTANT: you are using the $channel charm channel but hacluster is not published to that channel. Either switch to stable channel or post-upgrade hacluster to stable channel.\n" )
135+ MOD_MSGS[hacluster.0]="\nIMPORTANT: you are using the $channel charm channel but hacluster is not published to that channel. Either switch to stable channel or post-upgrade hacluster to stable channel.\n"
136 fi
137 }
138
139@@ -69,8 +69,8 @@ do
140 --ceph-proxy)
141 MOD_PARAMS[__CEPH_INTERFACE__]='ceph-proxy'
142 MOD_OVERLAYS+=( "ceph-proxy.yaml" )
143- MOD_MSGS+=("NOTE: once ceph has finished deploying do the following: juju config admin-key=<key> fsid=<fsid> monitor-hosts=<mon-addr-list>'")
144- MOD_MSGS+=( "Example: juju config ceph-proxy admin-key=AQALEzleKLCNDBAAxrOY8WbxF2B7lDx0TaswGA== fsid=e5e6aee2-4719-11ea-8264-fa163e50d5d1 monitor-hosts='10.5.0.11:6789 10.5.0.12:6789 10.5.0.13:6789'" )
145+ MOD_MSGS[ceph-proxy.0]="once ceph is ready, do 'juju config admin-key=<key> fsid=<fsid> monitor-hosts=<mon-addr-list>'"
146+ MOD_MSGS[ceph-proxy.1]="e.g. juju config ceph-proxy admin-key=AQALEzleKLCNDBAAxrOY8WbxF2B7lDx0TaswGA== fsid=e5e6aee2-4719-11ea-8264-fa163e50d5d1 monitor-hosts='10.5.0.11:6789 10.5.0.12:6789 10.5.0.13:6789'"
147 ;;
148 --ceph-fs)
149 MOD_OVERLAYS+=( "ceph-fs.yaml" )
150@@ -106,7 +106,7 @@ do
151 else
152 MOD_OVERLAYS+=( "k8s-easyrsa-docker-registry.yaml" )
153 fi
154- MOD_MSGS+=( "Execute tools/configure_docker_registry.sh to upload the images onto the docker registry and setting image registry of the cluster to point to docker registry")
155+ MOD_MSGS[docker-registry.0]="execute tools/configure_docker_registry.sh to upload the images and set image registry of the cluster to point to docker registry"
156 ;;
157 --e2e)
158 MOD_OVERLAYS+=( "k8s-e2e.yaml" )
159@@ -212,4 +212,3 @@ if ! has_opt --*-ha*; then
160 fi
161 fi
162
163-print_msgs
164diff --git a/kubernetes/pipeline/03build b/kubernetes/pipeline/03build
165index 8bd40d9..c432741 100644
166--- a/kubernetes/pipeline/03build
167+++ b/kubernetes/pipeline/03build
168@@ -13,6 +13,8 @@ fi
169
170 . $MOD_DIR/common/generate_bundle_base
171
172+print_msgs
173+
174 for f in $INTERNAL_BUNDLE_CONFIG_RENDERER $INTERNAL_BUNDLE_CONFIG; do
175 [ -n "$f" ] && [ -r "$f" ] && rm -f $f
176 done
177diff --git a/landscape/configure b/landscape/configure
178index 3eaea74..1deee07 100755
179--- a/landscape/configure
180+++ b/landscape/configure
181@@ -1,4 +1,4 @@
182-#!/bin/bash
183+#!/bin/bash -u
184
185 # Only run this after the units have settled.
186
187diff --git a/landscape/pipeline/00setup b/landscape/pipeline/00setup
188index 4f9b02e..1410a40 100644
189--- a/landscape/pipeline/00setup
190+++ b/landscape/pipeline/00setup
191@@ -11,7 +11,9 @@ export MOD_SSL_STATE_DIR=${MOD_NAME}
192 export -a MOD_PASSTHROUGH_OPTS=()
193
194 # Collection of messages to display at the end
195-export -a MOD_MSGS=()
196+export -A MOD_MSGS=()
197+# Use order 0 to ensure this is first displayed
198+MOD_MSGS[0_common.0]="run ./configure to initialise your deployment"
199
200 # Array list of overlays to use with this deployment.
201 export -a MOD_OVERLAYS=()
202diff --git a/landscape/pipeline/02configure b/landscape/pipeline/02configure
203index 27d8fe2..e3ec925 100644
204--- a/landscape/pipeline/02configure
205+++ b/landscape/pipeline/02configure
206@@ -1,4 +1,4 @@
207-#!/bin/bash -eu
208+#!/bin/bash
209 # Global variables are first defined in 00setup and module
210 # dependencies are defined in 01import-config-defaults
211 #
212@@ -31,4 +31,3 @@ target=$series
213 [ -z "$pocket" ] || target=${target}-$pocket
214 MOD_PASSTHROUGH_OPTS+=( --release-name $target )
215
216-print_msgs
217diff --git a/landscape/pipeline/03build b/landscape/pipeline/03build
218index 8bd40d9..c432741 100644
219--- a/landscape/pipeline/03build
220+++ b/landscape/pipeline/03build
221@@ -13,6 +13,8 @@ fi
222
223 . $MOD_DIR/common/generate_bundle_base
224
225+print_msgs
226+
227 for f in $INTERNAL_BUNDLE_CONFIG_RENDERER $INTERNAL_BUNDLE_CONFIG; do
228 [ -n "$f" ] && [ -r "$f" ] && rm -f $f
229 done
230diff --git a/openstack/configure b/openstack/configure
231index 076ef52..8d8a3f4 100755
232--- a/openstack/configure
233+++ b/openstack/configure
234@@ -1,2 +1,2 @@
235-#!/bin/sh
236+#!/bin/sh -u
237 ./profiles/stsstack $@
238diff --git a/openstack/pipeline/00setup b/openstack/pipeline/00setup
239index 2bf6e35..807a275 100644
240--- a/openstack/pipeline/00setup
241+++ b/openstack/pipeline/00setup
242@@ -11,7 +11,9 @@ export MOD_SSL_STATE_DIR=${MOD_NAME}
243 export -a MOD_PASSTHROUGH_OPTS=()
244
245 # Collection of messages to display at the end
246-export -a MOD_MSGS=()
247+export -A MOD_MSGS=()
248+# Use order 0 to ensure this is first displayed
249+MOD_MSGS[0_common.0]="run ./configure to initialise your deployment"
250
251 # Array list of overlays to use with this deployment.
252 export -a MOD_OVERLAYS=()
253diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
254index f604c55..c424113 100644
255--- a/openstack/pipeline/02configure
256+++ b/openstack/pipeline/02configure
257@@ -1,11 +1,10 @@
258-#!/bin/bash -eu
259+#!/bin/bash
260 # Global variables are first defined in 00setup and module
261 # dependencies are defined in 01import-config-defaults
262 #
263 # All overlay/bundle variables (MOD_PARAMS) defaults must go into
264 # the <module>/module_defaults file.
265
266-
267 # If using any variant of dvr-snat, there is no need for a neutron-gateway.
268 # We also don't currently need it when using ovn
269 is_neutron_gateway_required ()
270@@ -113,8 +112,8 @@ do
271 --ceph-proxy)
272 MOD_PARAMS[__CEPH_INTERFACE__]='ceph-proxy'
273 MOD_OVERLAYS+=( "ceph-proxy.yaml" )
274- MOD_MSGS+=("NOTE: once ceph has finished deploying do the following: juju config admin-key=<key> fsid=<fsid> monitor-hosts=<mon-addr-list>'")
275- MOD_MSGS+=( "Example: juju config ceph-proxy admin-key=AQALEzleKLCNDBAAxrOY8WbxF2B7lDx0TaswGA== fsid=e5e6aee2-4719-11ea-8264-fa163e50d5d1 monitor-hosts='10.5.0.11:6789 10.5.0.12:6789 10.5.0.13:6789'" )
276+ MOD_MSGS[ceph-proxy.0]="once ceph is ready, do 'juju config admin-key=<key> fsid=<fsid> monitor-hosts=<mon-addr-list>'"
277+ MOD_MSGS[ceph-proxy.1]="e.g. juju config ceph-proxy admin-key=AQALEzleKLCNDBAAxrOY8WbxF2B7lDx0TaswGA== fsid=e5e6aee2-4719-11ea-8264-fa163e50d5d1 monitor-hosts='10.5.0.11:6789 10.5.0.12:6789 10.5.0.13:6789'"
278 ;;
279 --ceph-ec)
280 assert_min_release stein "ceph-ec"
281@@ -140,14 +139,19 @@ do
282 msg="REQUIRED: designate-bind upstream dns server to forward requests to:"
283 get_param $1 __BIND_DNS_FORWARDER__ "$msg"
284 ns=${MOD_PARAMS[__ML2_DNS_FORWARDER__]}
285- MOD_MSGS+=( "NOTE: you will need to set neutron-gateway dns-servers=<designate-bind unit address> post-deploy (current=$ns)" )
286+ MOD_MSGS[designate.0]="Your upstream dns is currently $ns. Since you have designate deployed you can now do:"
287+ is_neutron_gateway_required && app=neutron-gateway || app=neutron-openvswitch
288+ MOD_MSGS[designate.1]="juju config $app dns-servers=<designate-bind unit address>"
289+ if has_opt --dvr; then
290+ app=neutron-openvswitch
291+ MOD_MSGS[designate.2]="juju config $app dns-servers=<designate-bind unit address>"
292+ fi
293 MOD_OVERLAYS+=( "memcached.yaml" )
294 MOD_OVERLAYS+=( "designate.yaml" )
295 ;;
296 --dvr)
297 # since ports typically set post-deployment ensure we don't clobber on re-run
298 opt=`update_from_charm_config $1 neutron-openvswitch data-port`
299- get_param "$opt" __DVR_DATA_PORT__ 'REQUIRED: compute host DVR data-port(s) (leave blank to set later):'
300 MOD_OVERLAYS+=( "neutron-dvr.yaml" )
301 ;;
302 --dvr-l3ha*)
303@@ -184,7 +188,7 @@ do
304 ;;
305 --graylog)
306 MOD_OVERLAYS+=( "graylog.yaml ")
307- MOD_MSGS+=( "NOTE: you will need to manually relate graylog (filebeat) to any other services you want to monitor" )
308+ MOD_MSGS[graylog.0]="need to manually relate filebeat to any services you want to monitor"
309 ;;
310 --grafana-channel) #__OPT__type:<str>
311 MOD_PARAMS[__GRAFANA_SNAP_CHANNEL__]="$2"
312@@ -199,7 +203,7 @@ do
313 if has_opt --ceph; then
314 MOD_OVERLAYS+=( "prometheus-ceph.yaml ")
315 fi
316- MOD_MSGS+=( "NOTE: telegraf has been related to core openstack services but you may need to add to others you have in your deployment" )
317+ MOD_MSGS[grafana.0]="need to manually relate telegraf to any services you want to monitor"
318 ;;
319 --nagios)
320 MOD_OVERLAYS+=( "nagios.yaml ")
321@@ -254,6 +258,7 @@ do
322 if ! has_opt --openstack-dashboard*; then
323 set -- $@ --openstack-dashboard && cache $@
324 fi
325+ MOD_MSGS[keystone-saml.0]="run ./tools/enable_samltestid.sh"
326 ;;
327 --manila)
328 assert_min_release rocky "manila"
329@@ -327,7 +332,11 @@ do
330 if ! has_opt --octavia-diskimage-retrofit-glance-simplestreams; then
331 MOD_OVERLAYS+=( "octavia-diskimage-retrofit-glance.yaml" )
332 fi
333- MOD_MSGS+=( "NOTE: do 'juju run-action octavia-diskimage-retrofit/0 --wait retrofit-image source-image=<uuid>' with id of glance image to be used for amphorae" )
334+ MOD_MSGS[octavia.0]="you need to to create an amphora image before you can use Octavia"
335+ MOD_MSGS[octavia.1]="this can be done in one of two ways:"
336+ MOD_MSGS[octavia.2]="run ./tools/upload_octavia_amphora_image.sh to use a pre-created image (recommended)"
337+ MOD_MSGS[octavia.3]="create a new image with 'juju run-action octavia-diskimage-retrofit/0 --wait retrofit-image source-image=<uuid>' with id of image in Glance to use as base"
338+ MOD_MSGS[octavia.4]="then run configure_octavia.sh to finish setting up octavia"
339 fi
340 ;;
341 --octavia-ha*)
342@@ -383,7 +392,6 @@ do
343 assert_min_release train "ovn"
344 # since ports typically set post-deployment ensure we don't clobber on re-run
345 opt=`update_from_charm_config $1 ovn-chassis bridge-interface-mappings`
346- get_param $opt __OVN_DATA_PORT__ 'REQUIRED: ovn-chassis bridge-interface-mappings (leave blank to set later):'
347 MOD_OVERLAYS+=( "neutron-ovn.yaml" )
348 if ! has_opt --vault*; then
349 set -- $@ --vault && cache $@
350@@ -486,6 +494,7 @@ do
351 done
352 fi
353 has_opt --ceph && MOD_OVERLAYS+=( "vault-ceph.yaml" )
354+ MOD_MSGS[vault.0]="run ./tools/vault-unseal-and-authorise.sh"
355 ;;
356 --etcd-channel) #__OPT__type:<str>
357 MOD_PARAMS[__ETCD_SNAP_CHANNEL__]=$2
358@@ -533,4 +542,3 @@ target=${series}-$release
359 [ -z "$pocket" ] || target=${target}-$pocket
360 MOD_PASSTHROUGH_OPTS+=( --release-name $target )
361
362-print_msgs
363diff --git a/openstack/pipeline/03build b/openstack/pipeline/03build
364index 8bd40d9..c432741 100644
365--- a/openstack/pipeline/03build
366+++ b/openstack/pipeline/03build
367@@ -13,6 +13,8 @@ fi
368
369 . $MOD_DIR/common/generate_bundle_base
370
371+print_msgs
372+
373 for f in $INTERNAL_BUNDLE_CONFIG_RENDERER $INTERNAL_BUNDLE_CONFIG; do
374 [ -n "$f" ] && [ -r "$f" ] && rm -f $f
375 done
376diff --git a/osm/configure b/osm/configure
377index 2bec54e..e75abe0 100755
378--- a/osm/configure
379+++ b/osm/configure
380@@ -1,3 +1,3 @@
381-#!/bin/bash
382+#!/bin/bash -u
383
384 echo "See doc/deploy_osd.md for setup info"
385diff --git a/osm/pipeline/00setup b/osm/pipeline/00setup
386index 7bc2172..0acc37b 100644
387--- a/osm/pipeline/00setup
388+++ b/osm/pipeline/00setup
389@@ -11,7 +11,9 @@ export MOD_SSL_STATE_DIR=${MOD_NAME}
390 export -a MOD_PASSTHROUGH_OPTS=()
391
392 # Collection of messages to display at the end
393-export -a MOD_MSGS=()
394+export -A MOD_MSGS=()
395+# Use order 0 to ensure this is first displayed
396+MOD_MSGS[0_common.0]="run ./configure to initialise your deployment"
397
398 # Array list of overlays to use with this deployment.
399 export -a MOD_OVERLAYS=()
400diff --git a/osm/pipeline/02configure b/osm/pipeline/02configure
401index 6af37bd..c986e59 100644
402--- a/osm/pipeline/02configure
403+++ b/osm/pipeline/02configure
404@@ -1,4 +1,4 @@
405-#!/bin/bash -eu
406+#!/bin/bash
407 # Global variables are first defined in 00setup and module
408 # dependencies are defined in 01import-config-defaults
409 #
410@@ -34,3 +34,4 @@ do
411 esac
412 shift
413 done
414+
415diff --git a/osm/pipeline/03build b/osm/pipeline/03build
416index 39204cf..4f2de9b 100644
417--- a/osm/pipeline/03build
418+++ b/osm/pipeline/03build
419@@ -26,6 +26,8 @@ fi
420
421 . $MOD_DIR/common/generate_bundle_base
422
423+print_msgs
424+
425 for f in $INTERNAL_BUNDLE_CONFIG_RENDERER $INTERNAL_BUNDLE_CONFIG; do
426 [ -n "$f" ] && [ -r "$f" ] && rm -f $f
427 done
428diff --git a/swift/configure b/swift/configure
429new file mode 100755
430index 0000000..f0b4638
431--- /dev/null
432+++ b/swift/configure
433@@ -0,0 +1 @@
434+#!/bin/bash -u
435diff --git a/swift/pipeline/00setup b/swift/pipeline/00setup
436index 699ea02..d86dfa5 100644
437--- a/swift/pipeline/00setup
438+++ b/swift/pipeline/00setup
439@@ -11,7 +11,9 @@ export MOD_SSL_STATE_DIR=${MOD_NAME}
440 export -a MOD_PASSTHROUGH_OPTS=()
441
442 # Collection of messages to display at the end
443-export -a MOD_MSGS=()
444+export -A MOD_MSGS=()
445+# Use order 0 to ensure this is first displayed
446+MOD_MSGS[0_common.0]="run ./configure to initialise your deployment"
447
448 # Array list of overlays to use with this deployment.
449 export -a MOD_OVERLAYS=()
450diff --git a/swift/pipeline/02configure b/swift/pipeline/02configure
451index e91f6fb..0907229 100644
452--- a/swift/pipeline/02configure
453+++ b/swift/pipeline/02configure
454@@ -1,10 +1,11 @@
455-#!/bin/bash -eu
456+#!/bin/bash
457 # Global variables are first defined in 00setup and module
458 # dependencies are defined in 01import-config-defaults
459 #
460 # All overlay/bundle variables (MOD_PARAMS) defaults must go into
461 # the <module>/module_defaults file.
462
463+
464 # Needed in all cases
465 MOD_OVERLAYS+=( "keystone.yaml" )
466
467@@ -38,9 +39,9 @@ do
468 --lma)
469 # Logging Monitoring and Alarming
470 MOD_OVERLAYS+=( "graylog.yaml ")
471- MOD_MSGS+=( "NOTE: you will need to manually relate graylog (filebeat) to any services you want to monitor" )
472 MOD_OVERLAYS+=( "grafana.yaml ")
473- MOD_MSGS+=( "NOTE: you will need to manually relate grafana (telegraf) to any services you want to monitor" )
474+ MOD_MSGS[lma.0]="need to manually relate filebeat (graylog) to any services you want to monitor"
475+ MOD_MSGS[lma.1]="need to manually relate telegraf (grafana) to any services you want to monitor"
476 ;;
477 --ssl)
478 (cd ssl; . ./create_ca_cert.sh $MOD_SSL_STATE_DIR;)
479@@ -89,4 +90,3 @@ target=${series}-$release
480 [ -z "$pocket" ] || target=${target}-$pocket
481 MOD_PASSTHROUGH_OPTS+=( --release-name $target )
482
483-print_msgs
484diff --git a/swift/pipeline/03build b/swift/pipeline/03build
485index 8bd40d9..c432741 100644
486--- a/swift/pipeline/03build
487+++ b/swift/pipeline/03build
488@@ -13,6 +13,8 @@ fi
489
490 . $MOD_DIR/common/generate_bundle_base
491
492+print_msgs
493+
494 for f in $INTERNAL_BUNDLE_CONFIG_RENDERER $INTERNAL_BUNDLE_CONFIG; do
495 [ -n "$f" ] && [ -r "$f" ] && rm -f $f
496 done

Subscribers

People subscribed via source and target branches