From 561b715d14fb453d7d542125e241f5193ccb2582 Mon Sep 17 00:00:00 2001 From: Bob Ball Date: Thu, 24 Sep 2015 13:22:56 +0100 Subject: [PATCH] Optionally install the supplemental pack Add a checkbox to the UI that allows the user to state that the supplemental pack need not be installed Change-Id: I82081e82cd9666a8b2e4af381b6fb203f2f03ffb --- deployment_scripts/compute_post_deployment.py | 21 +++--- doc/content/guide.rst | 2 + doc/user-guide.pdf | 72 ++++++++++++------- environment_config.yaml | 12 +++- 4 files changed, 71 insertions(+), 36 deletions(-) diff --git a/deployment_scripts/compute_post_deployment.py b/deployment_scripts/compute_post_deployment.py index f7ebe7a..39168b4 100755 --- a/deployment_scripts/compute_post_deployment.py +++ b/deployment_scripts/compute_post_deployment.py @@ -66,16 +66,18 @@ def get_astute(astute_path): return astute -def get_access(astute, access_section): +def get_options(astute, astute_section): """Return username and password filled in plugin.""" - if not access_section in astute: - warning('%s not found' % access_section) + if not astute_section in astute: + warning('%s not found' % astute_section) return None, None - access = astute[access_section] - info('username: {username}'.format(**access)) - info('password: {password}'.format(**access)) - return access['username'], access['password'] + options = astute[astute_section] + info('username: {username}'.format(**options)) + info('password: {password}'.format(**options)) + info('install_xapi: {install_xapi}'.format(**options)) + return options['username'], options['password'], \ + options['install_xapi'] def get_endpoints(astute): @@ -233,13 +235,14 @@ if __name__ == '__main__': install_xenapi_sdk() astute = get_astute(ASTUTE_PATH) if astute: - username, password = get_access(astute, ACCESS_SECTION) + username, password, install_xapi = get_options(astute, ASTUTE_SECTION) endpoints = get_endpoints(astute) eth, himn_local, himn_xs = init_eth() if username and password and endpoints and himn_local and himn_xs: route_to_compute( endpoints, himn_xs, himn_local, username, password) - install_suppack(himn_xs, username, password) + if install_xapi: + install_suppack(himn_xs, username, password) forward_from_himn(eth) create_novacompute_conf(himn_xs, username, password) restart_nova_services() diff --git a/doc/content/guide.rst b/doc/content/guide.rst index 6343f8b..12abf38 100644 --- a/doc/content/guide.rst +++ b/doc/content/guide.rst @@ -31,6 +31,8 @@ Select Environment .. image:: images/fmsetting00.png :width: 80% +#. If the XenServer host already has compatible Nova plugins installed, untick the checkbox to install the supplemental packs. In normal cases, the XenServer host will not have compatible Nova plugins installed, so leave the checkbox enabled + Finish environment configuration -------------------------------- diff --git a/doc/user-guide.pdf b/doc/user-guide.pdf index 0c1fd43..33e4c6e 100644 --- a/doc/user-guide.pdf +++ b/doc/user-guide.pdf @@ -57,13 +57,13 @@ stream Gb"0WhbP2(^;odDV,ppp-G15R#oI.m[BJ0`&H!5O/A-NJZ!&PiB,#9o`>!"MCZ!<=*qGQIk)&Ffl'E$4-H!8p+F`ma/8kVqCHducN8=R<h8_M%G#b&O,XnU,sn*Z0pMm'DUcoPOFNG'kd+e\l9S!-Q/M,NQL5k+b@3;g\T&!N+b^I0m*=R75TgmM4E!8(eeM5QAoNf!69OU"*7pi5T>WJ;FAM.WKefL>/:1Tpi[YfC8l:Ej[EmQ?r0amr(](:t,R!.`>917gm",XQ-UG&Ej(;(bjL4S`3B^*"-&o2S1s(qim$2]QT'D8j]QH(MS`CgK5G]W$8-r_3-ac/"G=GaaX,]^XqNcafSO?sgu1Soj5(@5bg#LkO1[<&W9*`)CkV%bjKXKCVn63sFW[_)bA&CL5nY99,ndFS9lJAr%f7a@39%jT"+!hfO"EP>+AlI7*_u1c#e[5@I$EY,)c-e1P8B+n9kX.JSL@5sI#o!+:;u.@rpcQ'@Mh!;b]5CRMK-TqPoREAX#,Z6o4(T9)'5:i7ot7_>.M+*pdrek>+I?Nnt$c\U4k&E>Go$=X::CuXO0j/][ZKt+4%EY@!Vk[%'EPf:[m;IoGjIN.]p>?L%WI"/].)Yl*%^`[fo;CYDEX3O1;@dWjR-44r)]=\\IaMNuZAuTRhJIVZIc/H=!!)?t3Q73:mC$Ip-e.Y,BR2T$HVZZ?e'*cSl&[V5G-oe8kpTgOYaO3#"^9aC'FeY&KnYVFP&_TrL@K*Tp:Fl.Z@:*PcDqLL2B17[7gJDPXDGVZ=tK%,1i*)E?%QeP8LG&Zhn8q.'G@*cnCScZa$Y+E!.(L$2:X_c-CSg'a:bnRFbM9s.`62;g0["R/jQ4H1OR"KIr4(!^&bpn/-Wik+1?Ja3!%iL/leB%ah:gLQci+k=s#C)A,Aj#>Feh+'=m3,sUFh9'Nq9Ae0jfQAkQ]cgdaZ)OdnJ&Y.\j!E,`aJ;!cDh=OE'\I<`A2sV8O!eGc;(FVPoS@YZUjHYVLCUG1mtl8jY_R)`n"-V6qXVhToPDYnSrAp7"mW7O@an;q?TtH#ChhXo>`3egm3YSK4LH0V:$&1>[EQp"HRCberh6pXZrT:l.k?Y6DCM]5r[ir(R>A&C>T?hI\aq3A-J5KIpu:Tk^2@5kI7QI$fQT7PB=T4[U5Mh0k82_I/)=H3mNGlWf;_nA,dJ?hp5Q3Ne-P&JMkmMr-ofY\90_8>!.KrEii/uZCLgs4f6@q?L`L^%YOSnRA#`X]f`PYF9"NK*W(p]',8s-\9tM8j!@Z/a-B$37j_P>+0ac-;6/O,Hmaqu=lG1`!]Z*I$XG!!)_[CuT.u,uc]kA.nrNe$=o[!!%0TnH8i2+Q<\-i'>3o!5O/A-NJZ!l$/YfS]u@K!!#R:nMEHpTC7d?!0El6Bk_;GdA'4\e'n-\%KHLWWp/csV]qfY!!#!o.KBGKzzzzzzzzzzz!!"-E4Qc^i!=sfKCe^+.k<.GmKiMJE=n($;-]4YmK`e_nGE1-bKK_L"X&X?8mIJRmKES\&>R(JB@$/)$U>>k,4Pe$,G*g5`"N+YnHA"tScDlK-TDA$"Mh<[nau>0r&,N0HQ)DW^p6,n1uDS?p'D+[OX&il%PcdBI6_HSY-S;dD0t:,+n:4[+J.L&`01jFLo8'bb5Qe%qh+IFZLX(VnO.2<''fJFIu&kkjV;oTG8'RkCM]?jUt'TPgp%ZI4b.d/6P*$gO?&oT.fOhiM>U#gf.G^hd@[d2%\C7Qg>Yl9W,(q@'U9cG&&8'2O+lCH`YRX!n"s5HKq2SEtL$m+gKjADU'D@8ht035iDu1t#EH^d^2=H>6aZN<`(F7?/5L;H-Vk6cP(_U=.IXCNk+REI<\Feft8H]mWb#F[`$)]g%hYm(;(7nRUb)PJ<__Su37Jb/]pY'2R7#iX$+"DER1)E)jCC6d_]B?.GLOCl*I%O:Re^VP8Gnb8FgIHEYsWk&45(eS&:\Z069XkkB8OQWbcG[h#lJkht`p('U5rO,U`1BA`*4-TDA$"G`B4;M2`e@$G'*bGoY.Se'UG[Gj5PgD-u&-qPW)X'-(^(hR3#m"qeh`p4>FC%SO#BS.?"SGlH:D%TL>pA9$F+\Yt2+4[`A_/h-AGeOlSO1CuZu,Xd;t,D'NM*e1@W*Ni,Q`hsI_,VbJb&pfI\7O?MS0NZm\cjP)[]KrU\AMj5J(.]Kn;N9V^uGVTW3daB,q.FZso]BnP!^4>`IA!+0jYsatB8@S:.m,1\]fI`"N+YnHA"tScDlK-TDA$"Md>d_)[eKghn9$J#a%[=LECudG:rqf>`.Nmb]b]?3'o_K+!)JpS=Ehf>0;%rY^_MQ:L&S4;N/ZV)n-$U5DT>+r5q&[39UV<6sP3#+s`WXzzzzzz@(1LHoA4f^h;5GIh64Q0(LPjCD>Ar*NJrfaUX=Jh-ie2tO\NNmQ\N5g554!O@pgMh$O\/Mk-j!^`5LKDG=a1_Q^qRoWQjo%aoE%O.UT.@t-`AjcZbn(.f[.E#&h]Y'd'?=;C;^3C:gr(l_\9Oaq4"&?RWJR*nQ!jFJ:-ffr*!jFJ:-ffr*!jFJ:-ffr*!jFJ:-ffr*!jFJ:-fi51nMGCE@stpW=f(TQHV7T5WjgRGf;H2a!r;9'3W_6I4Va@,G;&M;fQb3/Yk3%,IlcJ8>)2N`Ff1H#Qoj:63QWnF_V]M9jnHfFrUMW&cce%Krq5g=s/#V)n4pr$o=4WT2A`l'sG<5C@hpAXXX1u3H+&5g@BK7giqW\OC`if3=e0d&=<8R8jUH]69C*(%YVJfLb[Ymbe^@9*?4XG-\YA[$MT*j)\EjK]*?_`WXeaRur6k9eeWQ*ra<=K%=h8/6lBDeWM7`AW&,`GFXqH-p&@R0@'G5AXeimSr5tU6"HI#p[r_"Dfkuig/l!:Z_+,sGH^\*1lTGV;t]h<+)\4AnUA'Ug3bmID*72JOXq_Bn'@[@I\\P@7=DI90<7@`RE2!IkNq[A`WZnaL.3:rqik5a^q(_3I*4Im!7[8PD0&1f:a4AVq=t@YM=O^TZ41N[@@.EnWU\mGhZ;#m.8>YpKNM<*T?,1e`F?8iP=du>N/t])+,V4HHM9@pSeDV/%mF@/1L#U#cl?tCA>HrfJfdURN6YAPoJjW+8;;iBcYp1O(2CpH?.,,8=fE(;P-RY/'Bl3*f([ujE1D5F3fMUe7I!0)4Q.Ork:MZoSe:"==hnUu=.STs^R;YULC_X^J1F)s;+>mF8Wbj',lbq8k#]\rU^OJ.ipp,W9&OnqHPAX*kD2AdqfAiS"k0/AE6B<$@76p&]N40MqpXkpm(jber"8SK)iSUs'a&8@#GJ'1^:SQ+F;cnk_2]5Cc\'^@UKl>JmL&Sp],d-N^[A6LYcRP.XF-)8d;W>`HbO6NfNQW7%Rn^QdS7oKSXfeaU`X!""\PTT:34=Y"DrqP63S`/32:$u0&Du0VQ)uAH>UIWV6=i9(FB^;Xh&o/t2N@fI&E(,_mZ04-];Hls'Mc1VKO;-#.U=.XcMVa5eII4gE=/.Z)P:l[)Ff:$Tgnq*=mi,_^ZePlDXqeXf?\&8eM4-HB%_5B$GMMC2EMSf*n/q0T6QlIs-53kn+HilSWJ:K/o`f7Cf=qW?r&>$E=Ae>/SJfFQTV.DPL,\kE`n'G=PIeE0c9e/SlTl^4t)n:F+Om#P):95Vhb-XaW4&uEuRi8`EqX8QKuIN.RRYE1R#Ee;"]Zm;ZOTeC.fHgTkJ]"m%IGRE?-3d.:]hX'7]dMfUKB>YN]R8[O.>JtIWAJ`@7%3@NF(EYg/^(p.o0T$-=>:!9FU1Qtr:Y#fTRe86Z>.#DEMl3pLXf;uCXC5LQlLA>23Mh&E5+\i2b''L!X!b5=9>%i07*@OWK[Vhl),Ktkak#jDIkU?[M)X_9eMgC`Y-!st][m1ZmiP!PX&I`j,/NtV2>a7TUhrtMH:@N"[AmD.)<7m'Y;Vu[W[E;9lH.6p4],lNNVXSeM'qY:lS"6R``A[k?`bdTjmdCnr=eeB?14Wc$3/Osa+%5oF*7EF8pi?\3,N.fM5o_Js-W^:2WaVFWJA*biJZ=*F)p<)^5pe=RD*64%A@]cC5c@B0p,BlVg;O%oPnAlk+;.)m.[*qJMa>+OX6C-pSMlQ'k\@a^p6RWSr2rhDZZqAa]8opY6c6/^?'B0>6c6/^?'B0>6c6/^?PO4:+R@0JTGOO\ko`9#h>OS0ZnaAF-h$`QfgDendstream endobj 16 0 obj -<< /A << /S /URI /Type /Action /URI (https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#verify-networks) >> /Border [ 0 0 0 ] /Rect [ 106.8129 274.5972 221.2929 286.5972 ] /Subtype /Link /Type /Annot >> +<< /A << /S /URI /Type /Action /URI (https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#verify-networks) >> /Border [ 0 0 0 ] /Rect [ 106.8129 232.5972 221.2929 244.5972 ] /Subtype /Link /Type /Annot >> endobj 17 0 obj -<< /A << /S /URI /Type /Action /URI (https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#deploy-changes) >> /Border [ 0 0 0 ] /Rect [ 114.0329 256.5972 178.5129 268.5972 ] /Subtype /Link /Type /Annot >> +<< /A << /S /URI /Type /Action /URI (https://docs.mirantis.com/openstack/fuel/fuel-6.1/user-guide.html#deploy-changes) >> /Border [ 0 0 0 ] /Rect [ 114.0329 214.5972 178.5129 226.5972 ] /Subtype /Link /Type /Annot >> endobj 18 0 obj -<< /Annots [ 14 0 R 16 0 R 17 0 R ] /Contents 39 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 36 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] /XObject << /FormXob.49af0aa469f423c70d1893d8d0633831 15 0 R /FormXob.b7eb6386174183ab9472b7984bc3b740 13 0 R >> >> /Rotate 0 +<< /Annots [ 14 0 R 16 0 R 17 0 R ] /Contents 39 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 36 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] /XObject << /FormXob.49af0aa469f423c70d1893d8d0633831 15 0 R /FormXob.8909a9f6b77b93d0a2fc2662d6d8986a 13 0 R >> >> /Rotate 0 /Trans << >> /Type /Page >> endobj 19 0 obj @@ -80,7 +80,7 @@ endobj << /Outlines 23 0 R /PageLabels 41 0 R /PageMode /UseNone /Pages 36 0 R /Type /Catalog >> endobj 22 0 obj -<< /Author () /CreationDate (D:20150918145958+00'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) +<< /Author () /CreationDate (D:20150924134736+00'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) /Title () >> endobj 23 0 obj @@ -124,7 +124,7 @@ endobj << /Dest [ 12 0 R /XYZ 62.69291 449.6236 0 ] /Next 35 0 R /Parent 33 0 R /Title (Select Environment) >> endobj 35 0 obj -<< /Dest [ 18 0 R /XYZ 62.69291 318.8472 0 ] /Parent 33 0 R /Prev 34 0 R /Title (Finish environment configuration) >> +<< /Dest [ 18 0 R /XYZ 62.69291 276.8472 0 ] /Parent 33 0 R /Prev 34 0 R /Title (Finish environment configuration) >> endobj 36 0 obj << /Count 4 /Kids [ 7 0 R 12 0 R 18 0 R 20 0 R ] /Type /Pages >> @@ -848,7 +848,7 @@ Q endstream endobj 39 0 obj -<< /Length 3199 >> +<< /Length 3794 >> stream 1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET q @@ -881,7 +881,7 @@ q 1 0 0 1 20 0 cm q 341.5118 0 0 256.5273 0 0 cm -/FormXob.b7eb6386174183ab9472b7984bc3b740 Do +/FormXob.8909a9f6b77b93d0a2fc2662d6d8986a Do Q Q q @@ -948,22 +948,46 @@ q Q Q q -1 0 0 1 62.69291 330.8472 cm +1 0 0 1 62.69291 324.8472 cm Q q -1 0 0 1 62.69291 300.8472 cm +1 0 0 1 62.69291 288.8472 cm +0 0 0 rg +BT /F1 10 Tf 12 TL ET +q +1 0 0 1 6 21 cm +q +0 0 0 rg +BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (7.) Tj T* -5.66 0 Td ET +Q +Q +q +1 0 0 1 23 -3 cm +q +0 0 0 rg +BT 1 0 0 1 0 26 Tm /F1 10 Tf 12 TL 1.033555 Tw (If the XenServer host already has compatible Nova plugins installed, untick the checkbox to install) Tj T* 0 Tw .359269 Tw (the supplemental packs. In normal cases, the XenServer host will not have compatible Nova plugins) Tj T* 0 Tw (installed, so leave the checkbox enabled) Tj T* ET +Q +Q +q +Q +Q +q +1 0 0 1 62.69291 288.8472 cm +Q +q +1 0 0 1 62.69291 258.8472 cm q BT 1 0 0 1 0 3 Tm 18 TL /F2 15 Tf 0 0 0 rg (Finish environment configuration) Tj T* ET Q Q q -1 0 0 1 62.69291 288.8472 cm +1 0 0 1 62.69291 246.8472 cm Q q -1 0 0 1 62.69291 288.8472 cm +1 0 0 1 62.69291 246.8472 cm Q q -1 0 0 1 62.69291 276.8472 cm +1 0 0 1 62.69291 234.8472 cm 0 0 0 rg BT /F1 10 Tf 12 TL ET q @@ -983,10 +1007,10 @@ q Q Q q -1 0 0 1 62.69291 270.8472 cm +1 0 0 1 62.69291 228.8472 cm Q q -1 0 0 1 62.69291 258.8472 cm +1 0 0 1 62.69291 216.8472 cm 0 0 0 rg BT /F1 10 Tf 12 TL ET q @@ -1006,10 +1030,10 @@ q Q Q q -1 0 0 1 62.69291 252.8472 cm +1 0 0 1 62.69291 210.8472 cm Q q -1 0 0 1 62.69291 240.8472 cm +1 0 0 1 62.69291 198.8472 cm 0 0 0 rg BT /F1 10 Tf 12 TL ET q @@ -1114,17 +1138,17 @@ xref 0000131530 00000 n 0000139513 00000 n 0000144883 00000 n -0000148139 00000 n -0000148487 00000 n -0000148558 00000 n -0000148595 00000 n -0000148632 00000 n -0000148669 00000 n +0000148734 00000 n +0000149082 00000 n +0000149153 00000 n +0000149190 00000 n +0000149227 00000 n +0000149264 00000 n trailer << /ID % ReportLab generated PDF document -- digest (http://www.reportlab.com) - [(\026\024\212#V\3276\310l\344\3669D\262\302Y) (\026\024\212#V\3276\310l\344\3669D\262\302Y)] + [(M\003\034\016\036\006\011\371\350O\177&\356\344\244\202) (M\003\034\016\036\006\011\371\350O\177&\356\344\244\202)] /Info 22 0 R /Root 21 0 R /Size 46 >> startxref -148706 +149301 %%EOF diff --git a/environment_config.yaml b/environment_config.yaml index a79c4c7..7538e57 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -3,14 +3,20 @@ attributes: value: 'root' label: 'Username' description: '' - weight: 25 + weight: 10 type: "text" password: value: '' label: 'Password' description: '' - weight: 25 + weight: 20 type: "password" regex: source: '\S' - error: "Password cannot be empty" \ No newline at end of file + error: "Password cannot be empty" + install_xapi: + value: true + label: 'Install Nova Plugins' + description: '' + weight: 30 + type: "checkbox" \ No newline at end of file