From 790dc6ac6fe62a15ee3cd7e4ce0768b2a46f7238 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: 2024年9月15日 23:16:54 +0900
Subject: [PATCH] Fix inconsistent deployment architecture switch
Only scenario 004 used 'Ubuntu or not' while the other scenarios use
'Debian family or not'.
Change-Id: I6f9d1181c9e51ea97129f12ee36bbfa9f0cde189
(cherry picked from commit 37195f63e427615cba335498579f2222060f3c0f)
---
 fixtures/scenario004.pp &#124; 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp
index bd9b3931d..eccbadf91 100644
--- a/fixtures/scenario004.pp
+++ b/fixtures/scenario004.pp
@@ -20,24 +20,27 @@ if $facts['os']['name'] == 'Ubuntu' {
 $ssl = true
 }
 
-if $facts['os']['name'] == 'Ubuntu' {
- $ipv6 = false
- # TODO(tobias-urdin): No service plugin 'BGPVPN'
- $bgpvpn_enabled = false
- # TODO(tobias-urdin): Plugin 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin' not found.
- $l2gw_enabled = false
- # FIXME(ykarel) Disable bgp_dragent until Ubuntu python3 stein(with stein packages) jobs are ready
- $bgp_dragent_enabled = false
- # TODO(tkajinam): Enable these along with the other plugins
- $vpnaas_enabled = false
- $taas_enabled = false
-} else {
- $ipv6 = true
- $bgpvpn_enabled = true
- $l2gw_enabled = true
- $bgp_dragent_enabled = true
- $vpnaas_enabled = true
- $taas_enabled = true
+case $facts['os']['family'] {
+ 'Debian': {
+ $ipv6 = false
+ # TODO(tkajinam): Need additional work to load the plugins
+ $bgpvpn_enabled = false
+ $l2gw_enabled = false
+ $bgp_dragent_enabled = false
+ $vpnaas_enabled = false
+ $taas_enabled = false
+ }
+ 'RedHat': {
+ $ipv6 = true
+ $bgpvpn_enabled = true
+ $l2gw_enabled = true
+ $bgp_dragent_enabled = true
+ $vpnaas_enabled = true
+ $taas_enabled = true
+ }
+ default: {
+ fail("Unsupported osfamily (${facts['os']['family']})")
+ }
 }
 
 include openstack_integration
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/puppet-openstack-integration/commit/790dc6ac6fe62a15ee3cd7e4ce0768b2a46f7238.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/puppet-openstack-integration/commit/790dc6ac6fe62a15ee3cd7e4ce0768b2a46f7238.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>