Browse Source

Update fixtures to support Fuel-10.0

- Updated scripts to generate fixtures for 10.0
- Script now generates fake nodes to work with
- Added multirack support and fixtures
- Uploaded new fixtures 10.0 build #260

Partial-bug: #1535339
Change-Id: Ib1947b111c0da1b4a58adf14b6bd1e583074b083
Aleksandr Didenko 2 years ago
parent
commit
1cf4996ca1
41 changed files with 61293 additions and 26771 deletions
  1. 30
    29
      hiera/master.yaml
  2. 2112
    521
      hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml
  3. 2083
    610
      hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml
  4. 2108
    1018
      hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml
  5. 2084
    523
      hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml
  6. 2108
    1183
      hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml
  7. 2084
    523
      hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml
  8. 1895
    352
      hiera/neut_tun.ironic-ironic.yaml
  9. 1944
    1025
      hiera/neut_tun.ironic-primary-controller.yaml
  10. 1964
    1043
      hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml
  11. 2976
    0
      hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-ceph-osd.yaml
  12. 2927
    0
      hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-compute.yaml
  13. 3025
    0
      hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-controller.yaml
  14. 2927
    0
      hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-mongo.yaml
  15. 0
    1304
      hiera/neut_tun.murano.sahara.ceil.public_ssl-ceph-osd.yaml
  16. 0
    1373
      hiera/neut_tun.murano.sahara.ceil.public_ssl-compute.yaml
  17. 0
    2039
      hiera/neut_tun.murano.sahara.ceil.public_ssl-primary-controller.yaml
  18. 0
    1285
      hiera/neut_tun.murano.sahara.ceil.public_ssl-primary-mongo.yaml
  19. 1844
    270
      hiera/neut_tun.vms_conf-virt.yaml
  20. 2842
    0
      hiera/neut_vlan.cblock.murano.sahara.ceil-cinder-block-device.yaml
  21. 2841
    0
      hiera/neut_vlan.cblock.murano.sahara.ceil-cinder.yaml
  22. 2846
    0
      hiera/neut_vlan.cblock.murano.sahara.ceil-compute.yaml
  23. 2976
    0
      hiera/neut_vlan.cblock.murano.sahara.ceil-controller.yaml
  24. 2846
    0
      hiera/neut_vlan.cblock.murano.sahara.ceil-mongo.yaml
  25. 2976
    0
      hiera/neut_vlan.cblock.murano.sahara.ceil-primary-controller.yaml
  26. 2846
    0
      hiera/neut_vlan.cblock.murano.sahara.ceil-primary-mongo.yaml
  27. 2066
    479
      hiera/neut_vlan.ceph-ceph-osd.yaml
  28. 2037
    568
      hiera/neut_vlan.ceph-compute.yaml
  29. 2061
    1140
      hiera/neut_vlan.ceph-primary-controller.yaml
  30. 1951
    1030
      hiera/neut_vlan.dvr-primary-controller.yaml
  31. 0
    1292
      hiera/neut_vlan.murano.sahara.ceil-cinder-block-device.yaml
  32. 0
    1291
      hiera/neut_vlan.murano.sahara.ceil-cinder.yaml
  33. 0
    1373
      hiera/neut_vlan.murano.sahara.ceil-compute.yaml
  34. 0
    1874
      hiera/neut_vlan.murano.sahara.ceil-controller.yaml
  35. 0
    1285
      hiera/neut_vlan.murano.sahara.ceil-mongo.yaml
  36. 0
    2039
      hiera/neut_vlan.murano.sahara.ceil-primary-controller.yaml
  37. 0
    1285
      hiera/neut_vlan.murano.sahara.ceil-primary-mongo.yaml
  38. 1
    0
      utils/fixtures/.gitignore
  39. 737
    0
      utils/fixtures/nodes_template.erb
  40. 28
    0
      utils/generate_nodes_fixtures.rb
  41. 128
    17
      utils/generate_yamls.sh

+ 30
- 29
hiera/master.yaml View File

@@ -1,13 +1,12 @@
1 1
 "ADMIN_NETWORK":
2
-  "cidr": "10.20.0.0/24"
3
-  "dhcp_gateway": "10.110.0.1"
4
-  "dhcp_pool_end": "10.110.0.254"
5
-  "dhcp_pool_start": "10.110.0.3"
6
-  "interface": "enp0s3"
7
-  "ipaddress": "10.110.0.2"
8
-  "mac": "64:85:68:bb:ff:c1"
2
+  "dhcp_gateway": "10.145.0.1"
3
+  "dhcp_pool_end": "10.145.0.254"
4
+  "dhcp_pool_start": "10.145.0.4"
5
+  "interface": "eth0"
6
+  "ipaddress": "10.145.0.2"
7
+  "mac": "64:ef:bc:bf:6c:44"
9 8
   "netmask": "255.255.255.0"
10
-  "size": "256"
9
+  "ssh_network": "10.145.0.0/24"
11 10
 "BOOTSTRAP":
12 11
   "flavor": "ubuntu"
13 12
   "http_proxy": ""
@@ -34,64 +33,66 @@
34 33
   - "name": "mos"
35 34
     "priority": !!int "1050"
36 35
     "section": "main restricted"
37
-    "suite": "mos9.0"
36
+    "suite": "mos10.0"
38 37
     "type": "deb"
39 38
     "uri": "http://127.0.0.1:8080/ubuntu/x86_64"
40 39
   - "name": "mos-updates"
41 40
     "priority": !!int "1050"
42 41
     "section": "main restricted"
43
-    "suite": "mos9.0-updates"
42
+    "suite": "mos10.0-updates"
44 43
     "type": "deb"
45
-    "uri": "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0"
44
+    "uri": "http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0"
46 45
   - "name": "mos-security"
47 46
     "priority": !!int "1050"
48 47
     "section": "main restricted"
49
-    "suite": "mos9.0-security"
48
+    "suite": "mos10.0-security"
50 49
     "type": "deb"
51
-    "uri": "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0"
50
+    "uri": "http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0"
52 51
   - "name": "mos-holdback"
53 52
     "priority": !!int "1100"
54 53
     "section": "main restricted"
55
-    "suite": "mos9.0-holdback"
54
+    "suite": "mos10.0-holdback"
56 55
     "type": "deb"
57
-    "uri": "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0"
58
-"DNS_DOMAIN": "test.domain.local"
59
-"DNS_SEARCH": "test.domain.local"
60
-"DNS_UPSTREAM": "10.110.0.1"
56
+    "uri": "http://mirror.fuel-infra.org/mos-repos/ubuntu/10.0"
57
+  "skip_default_img_build": !!bool "false"
58
+"DNS_DOMAIN": "domain.tld"
59
+"DNS_SEARCH": "domain.tld"
60
+"DNS_UPSTREAM": "10.145.0.1"
61 61
 "FEATURE_GROUPS": []
62 62
 "FUEL_ACCESS":
63 63
   "password": "admin"
64 64
   "user": "admin"
65
-"HOSTNAME": "nailgun"
65
+"HOSTNAME": "fuel"
66 66
 "NTP1": "0.fuel.pool.ntp.org"
67 67
 "NTP2": "1.fuel.pool.ntp.org"
68 68
 "NTP3": "2.fuel.pool.ntp.org"
69 69
 "PRODUCTION": "docker"
70
+"TEST_DNS": "www.google.com"
70 71
 "astute":
71
-  "password": "hRUGy7sN8SPLtNDuxVrvLssT"
72
+  "password": "uSdbi42Po5gcHnUUdVT48diu"
72 73
   "user": "naily"
73 74
 "cobbler":
74
-  "password": "ljTrP3aSxa7SsvUDCsZeKjr4"
75
+  "password": "P2guQCCl9MHS88RCRF5I1QGw"
75 76
   "user": "cobbler"
76 77
 "keystone":
77
-  "admin_token": "iaz5tWhjiSQ8IuHLc1bP0NmS"
78
-  "monitord_password": "hHFchzEvtedWE202DYjPZZoT"
78
+  "admin_token": "M1khaGkHj72wMMp4JZ0TYnYt"
79
+  "monitord_password": "euniPf5A3LdUjSokt4tJ3BCw"
79 80
   "monitord_user": "monitord"
80
-  "nailgun_password": "fDcKY6waXpkNfmpAp7bRIl89"
81
+  "nailgun_password": "Llw1eTOaIYq3VzxUDhrNcd91"
81 82
   "nailgun_user": "nailgun"
82
-  "ostf_password": "MHt1M0rw1aYuOufDw2DJMwt7"
83
+  "ostf_password": "uSjjpBrV3t4URfCGoSse4fZ6"
83 84
   "ostf_user": "ostf"
84 85
   "service_token_off": "true"
85 86
 "mcollective":
86
-  "password": "gtFlQ3XAtiq8V7rMRQZ9IbnJ"
87
+  "password": "wbYJ8IXSrJyon5GNvx2Ad9xf"
87 88
   "user": "mcollective"
88 89
 "postgres":
89 90
   "keystone_dbname": "keystone"
90
-  "keystone_password": "FW6fCHC6WCfKcUG4jZuWzFH4"
91
+  "keystone_password": "IuocdY94d7PWfNq5i89OEyE2"
91 92
   "keystone_user": "keystone"
92 93
   "nailgun_dbname": "nailgun"
93
-  "nailgun_password": "ykduaP2bYnGUfPR7yPWekFC5"
94
+  "nailgun_password": "VNTUIHHMLvaiSffK5Dlwmh9U"
94 95
   "nailgun_user": "nailgun"
95 96
   "ostf_dbname": "ostf"
96
-  "ostf_password": "GPoocLyKzs5iTfOnlLOQ6kEZ"
97
+  "ostf_password": "WzjtGGb4oW07wPqqUiLvAB3E"
97 98
   "ostf_user": "ostf"

+ 2112
- 521
hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml
File diff suppressed because it is too large
View File


+ 2083
- 610
hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml
File diff suppressed because it is too large
View File


+ 2108
- 1018
hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml
File diff suppressed because it is too large
View File


+ 2084
- 523
hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml
File diff suppressed because it is too large
View File


+ 2108
- 1183
hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 2084
- 523
hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml
File diff suppressed because it is too large
View File


+ 1895
- 352
hiera/neut_tun.ironic-ironic.yaml
File diff suppressed because it is too large
View File


+ 1944
- 1025
hiera/neut_tun.ironic-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 1964
- 1043
hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 2976
- 0
hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-ceph-osd.yaml
File diff suppressed because it is too large
View File


+ 2927
- 0
hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-compute.yaml
File diff suppressed because it is too large
View File


+ 3025
- 0
hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 2927
- 0
hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-mongo.yaml
File diff suppressed because it is too large
View File


+ 0
- 1304
hiera/neut_tun.murano.sahara.ceil.public_ssl-ceph-osd.yaml
File diff suppressed because it is too large
View File


+ 0
- 1373
hiera/neut_tun.murano.sahara.ceil.public_ssl-compute.yaml
File diff suppressed because it is too large
View File


+ 0
- 2039
hiera/neut_tun.murano.sahara.ceil.public_ssl-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 0
- 1285
hiera/neut_tun.murano.sahara.ceil.public_ssl-primary-mongo.yaml
File diff suppressed because it is too large
View File


+ 1844
- 270
hiera/neut_tun.vms_conf-virt.yaml
File diff suppressed because it is too large
View File


+ 2842
- 0
hiera/neut_vlan.cblock.murano.sahara.ceil-cinder-block-device.yaml
File diff suppressed because it is too large
View File


+ 2841
- 0
hiera/neut_vlan.cblock.murano.sahara.ceil-cinder.yaml
File diff suppressed because it is too large
View File


+ 2846
- 0
hiera/neut_vlan.cblock.murano.sahara.ceil-compute.yaml
File diff suppressed because it is too large
View File


+ 2976
- 0
hiera/neut_vlan.cblock.murano.sahara.ceil-controller.yaml
File diff suppressed because it is too large
View File


+ 2846
- 0
hiera/neut_vlan.cblock.murano.sahara.ceil-mongo.yaml
File diff suppressed because it is too large
View File


+ 2976
- 0
hiera/neut_vlan.cblock.murano.sahara.ceil-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 2846
- 0
hiera/neut_vlan.cblock.murano.sahara.ceil-primary-mongo.yaml
File diff suppressed because it is too large
View File


+ 2066
- 479
hiera/neut_vlan.ceph-ceph-osd.yaml
File diff suppressed because it is too large
View File


+ 2037
- 568
hiera/neut_vlan.ceph-compute.yaml
File diff suppressed because it is too large
View File


+ 2061
- 1140
hiera/neut_vlan.ceph-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 1951
- 1030
hiera/neut_vlan.dvr-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 0
- 1292
hiera/neut_vlan.murano.sahara.ceil-cinder-block-device.yaml
File diff suppressed because it is too large
View File


+ 0
- 1291
hiera/neut_vlan.murano.sahara.ceil-cinder.yaml
File diff suppressed because it is too large
View File


+ 0
- 1373
hiera/neut_vlan.murano.sahara.ceil-compute.yaml
File diff suppressed because it is too large
View File


+ 0
- 1874
hiera/neut_vlan.murano.sahara.ceil-controller.yaml
File diff suppressed because it is too large
View File


+ 0
- 1285
hiera/neut_vlan.murano.sahara.ceil-mongo.yaml
File diff suppressed because it is too large
View File


+ 0
- 2039
hiera/neut_vlan.murano.sahara.ceil-primary-controller.yaml
File diff suppressed because it is too large
View File


+ 0
- 1285
hiera/neut_vlan.murano.sahara.ceil-primary-mongo.yaml
File diff suppressed because it is too large
View File


+ 1
- 0
utils/fixtures/.gitignore View File

@@ -0,0 +1 @@
1
+*.json

+ 737
- 0
utils/fixtures/nodes_template.erb View File

@@ -0,0 +1,737 @@
1
+[
2
+<% nodes.each do |node| %>
3
+    {
4
+        "pk": <%= node['pk'] %>,
5
+        "model": "nailgun.node",
6
+        "fields": {
7
+            "status": "discover",
8
+            "name": "fnode-<%= node['id'] %>",
9
+            "hostname": "fnode-<%= node['id'] %>",
10
+            "ip": "<%= node['ip'] %>",
11
+            "online": true,
12
+            "labels": {},
13
+            "pending_addition": false,
14
+            "platform_name": "X9DRW",
15
+            "mac": "<%= node['main_mac'] %>",
16
+            "meta": {
17
+                "cpu": {
18
+                    "real": 2,
19
+                    "total": 24,
20
+                    "spec": [
21
+                        {
22
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
23
+                            "frequency": 2001
24
+                        },
25
+                        {
26
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
27
+                            "frequency": 2001
28
+                        },
29
+                        {
30
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
31
+                            "frequency": 2001
32
+                        },
33
+                        {
34
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
35
+                            "frequency": 2001
36
+                        },
37
+                        {
38
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
39
+                            "frequency": 2001
40
+                        },
41
+                        {
42
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
43
+                            "frequency": 2001
44
+                        },
45
+                        {
46
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
47
+                            "frequency": 2001
48
+                        },
49
+                        {
50
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
51
+                            "frequency": 2001
52
+                        },
53
+                        {
54
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
55
+                            "frequency": 2001
56
+                        },
57
+                        {
58
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
59
+                            "frequency": 2001
60
+                        },
61
+                        {
62
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
63
+                            "frequency": 2001
64
+                        },
65
+                        {
66
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
67
+                            "frequency": 2001
68
+                        },
69
+                        {
70
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
71
+                            "frequency": 2001
72
+                        },
73
+                        {
74
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
75
+                            "frequency": 2001
76
+                        },
77
+                        {
78
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
79
+                            "frequency": 2001
80
+                        },
81
+                        {
82
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
83
+                            "frequency": 2001
84
+                        },
85
+                        {
86
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
87
+                            "frequency": 2001
88
+                        },
89
+                        {
90
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
91
+                            "frequency": 2001
92
+                        },
93
+                        {
94
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
95
+                            "frequency": 2001
96
+                        },
97
+                        {
98
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
99
+                            "frequency": 2001
100
+                        },
101
+                        {
102
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
103
+                            "frequency": 2001
104
+                        },
105
+                        {
106
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
107
+                            "frequency": 2001
108
+                        },
109
+                        {
110
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
111
+                            "frequency": 2001
112
+                        },
113
+                        {
114
+                            "model": "Intel(R) Xeon(R) CPU E5-2620 0 @ 2.00GHz",
115
+                            "frequency": 2001
116
+                        }
117
+                    ]
118
+                },
119
+                "interfaces": [
120
+                    {
121
+                        "bus_info": "0000:00:03.0",
122
+                        "current_speed": 1000,
123
+                        "driver": "e1000",
124
+                        "interface_properties": {
125
+                            "numa_node": null,
126
+                            "pci_id": "8086:100e",
127
+                            "sriov": {
128
+                                "available": false,
129
+                                "pci_id": "",
130
+                                "sriov_totalvfs": 0
131
+                            }
132
+                        },
133
+                        "ip": "<%= node['ip'] %>",
134
+                        "mac": "<%= node['main_mac'] %>",
135
+                        "max_speed": 1000,
136
+                        "name": "enp0s3",
137
+                        "netmask": "255.255.255.0",
138
+                        "offloading_modes": [
139
+                            {
140
+                                "name": "rx-all",
141
+                                "state": null,
142
+                                "sub": []
143
+                            },
144
+                            {
145
+                                "name": "rx-fcs",
146
+                                "state": null,
147
+                                "sub": []
148
+                            },
149
+                            {
150
+                                "name": "tx-nocache-copy",
151
+                                "state": null,
152
+                                "sub": []
153
+                            },
154
+                            {
155
+                                "name": "rx-vlan-offload",
156
+                                "state": null,
157
+                                "sub": []
158
+                            },
159
+                            {
160
+                                "name": "generic-receive-offload",
161
+                                "state": null,
162
+                                "sub": []
163
+                            },
164
+                            {
165
+                                "name": "generic-segmentation-offload",
166
+                                "state": null,
167
+                                "sub": []
168
+                            },
169
+                            {
170
+                                "name": "tcp-segmentation-offload",
171
+                                "state": null,
172
+                                "sub": [
173
+                                    {
174
+                                        "name": "tx-tcp-segmentation",
175
+                                        "state": null,
176
+                                        "sub": []
177
+                                    }
178
+                                ]
179
+                            },
180
+                            {
181
+                                "name": "scatter-gather",
182
+                                "state": null,
183
+                                "sub": [
184
+                                    {
185
+                                        "name": "tx-scatter-gather",
186
+                                        "state": null,
187
+                                        "sub": []
188
+                                    }
189
+                                ]
190
+                            },
191
+                            {
192
+                                "name": "tx-checksumming",
193
+                                "state": null,
194
+                                "sub": [
195
+                                    {
196
+                                        "name": "tx-checksum-ip-generic",
197
+                                        "state": null,
198
+                                        "sub": []
199
+                                    }
200
+                                ]
201
+                            },
202
+                            {
203
+                                "name": "rx-checksumming",
204
+                                "state": null,
205
+                                "sub": []
206
+                            }
207
+                        ],
208
+                        "pxe": false,
209
+                        "state": "up"
210
+                    },
211
+                    {
212
+                        "bus_info": "0000:00:04.0",
213
+                        "current_speed": 1000,
214
+                        "driver": "e1000",
215
+                        "interface_properties": {
216
+                            "numa_node": null,
217
+                            "pci_id": "8086:100e",
218
+                            "sriov": {
219
+                                "available": false,
220
+                                "pci_id": "",
221
+                                "sriov_totalvfs": 0
222
+                            }
223
+                        },
224
+                        "mac": "<%= node['nic2_mac'] %>",
225
+                        "max_speed": 1000,
226
+                        "name": "enp0s4",
227
+                        "offloading_modes": [
228
+                            {
229
+                                "name": "rx-all",
230
+                                "state": null,
231
+                                "sub": []
232
+                            },
233
+                            {
234
+                                "name": "rx-fcs",
235
+                                "state": null,
236
+                                "sub": []
237
+                            },
238
+                            {
239
+                                "name": "tx-nocache-copy",
240
+                                "state": null,
241
+                                "sub": []
242
+                            },
243
+                            {
244
+                                "name": "rx-vlan-offload",
245
+                                "state": null,
246
+                                "sub": []
247
+                            },
248
+                            {
249
+                                "name": "generic-receive-offload",
250
+                                "state": null,
251
+                                "sub": []
252
+                            },
253
+                            {
254
+                                "name": "generic-segmentation-offload",
255
+                                "state": null,
256
+                                "sub": []
257
+                            },
258
+                            {
259
+                                "name": "tcp-segmentation-offload",
260
+                                "state": null,
261
+                                "sub": [
262
+                                    {
263
+                                        "name": "tx-tcp-segmentation",
264
+                                        "state": null,
265
+                                        "sub": []
266
+                                    }
267
+                                ]
268
+                            },
269
+                            {
270
+                                "name": "scatter-gather",
271
+                                "state": null,
272
+                                "sub": [
273
+                                    {
274
+                                        "name": "tx-scatter-gather",
275
+                                        "state": null,
276
+                                        "sub": []
277
+                                    }
278
+                                ]
279
+                            },
280
+                            {
281
+                                "name": "tx-checksumming",
282
+                                "state": null,
283
+                                "sub": [
284
+                                    {
285
+                                        "name": "tx-checksum-ip-generic",
286
+                                        "state": null,
287
+                                        "sub": []
288
+                                    }
289
+                                ]
290
+                            },
291
+                            {
292
+                                "name": "rx-checksumming",
293
+                                "state": null,
294
+                                "sub": []
295
+                            }
296
+                        ],
297
+                        "pxe": false,
298
+                        "state": "down"
299
+                    },
300
+                    {
301
+                        "bus_info": "0000:00:05.0",
302
+                        "current_speed": 1000,
303
+                        "driver": "e1000",
304
+                        "interface_properties": {
305
+                            "numa_node": null,
306
+                            "pci_id": "8086:100e",
307
+                            "sriov": {
308
+                                "available": false,
309
+                                "pci_id": "",
310
+                                "sriov_totalvfs": 0
311
+                            }
312
+                        },
313
+                        "mac": "<%= node['nic3_mac'] %>",
314
+                        "max_speed": 1000,
315
+                        "name": "enp0s5",
316
+                        "offloading_modes": [
317
+                            {
318
+                                "name": "rx-all",
319
+                                "state": null,
320
+                                "sub": []
321
+                            },
322
+                            {
323
+                                "name": "rx-fcs",
324
+                                "state": null,
325
+                                "sub": []
326
+                            },
327
+                            {
328
+                                "name": "tx-nocache-copy",
329
+                                "state": null,
330
+                                "sub": []
331
+                            },
332
+                            {
333
+                                "name": "rx-vlan-offload",
334
+                                "state": null,
335
+                                "sub": []
336
+                            },
337
+                            {
338
+                                "name": "generic-receive-offload",
339
+                                "state": null,
340
+                                "sub": []
341
+                            },
342
+                            {
343
+                                "name": "generic-segmentation-offload",
344
+                                "state": null,
345
+                                "sub": []
346
+                            },
347
+                            {
348
+                                "name": "tcp-segmentation-offload",
349
+                                "state": null,
350
+                                "sub": [
351
+                                    {
352
+                                        "name": "tx-tcp-segmentation",
353
+                                        "state": null,
354
+                                        "sub": []
355
+                                    }
356
+                                ]
357
+                            },
358
+                            {
359
+                                "name": "scatter-gather",
360
+                                "state": null,
361
+                                "sub": [
362
+                                    {
363
+                                        "name": "tx-scatter-gather",
364
+                                        "state": null,
365
+                                        "sub": []
366
+                                    }
367
+                                ]
368
+                            },
369
+                            {
370
+                                "name": "tx-checksumming",
371
+                                "state": null,
372
+                                "sub": [
373
+                                    {
374
+                                        "name": "tx-checksum-ip-generic",
375
+                                        "state": null,
376
+                                        "sub": []
377
+                                    }
378
+                                ]
379
+                            },
380
+                            {
381
+                                "name": "rx-checksumming",
382
+                                "state": null,
383
+                                "sub": []
384
+                            }
385
+                        ],
386
+                        "pxe": false,
387
+                        "state": "down"
388
+                    },
389
+                    {
390
+                        "bus_info": "0000:00:06.0",
391
+                        "current_speed": 1000,
392
+                        "driver": "e1000",
393
+                        "interface_properties": {
394
+                            "numa_node": null,
395
+                            "pci_id": "8086:100e",
396
+                            "sriov": {
397
+                                "available": false,
398
+                                "pci_id": "",
399
+                                "sriov_totalvfs": 0
400
+                            }
401
+                        },
402
+                        "mac": "<%= node['nic4_mac'] %>",
403
+                        "max_speed": 1000,
404
+                        "name": "enp0s6",
405
+                        "offloading_modes": [
406
+                            {
407
+                                "name": "rx-all",
408
+                                "state": null,
409
+                                "sub": []
410
+                            },
411
+                            {
412
+                                "name": "rx-fcs",
413
+                                "state": null,
414
+                                "sub": []
415
+                            },
416
+                            {
417
+                                "name": "tx-nocache-copy",
418
+                                "state": null,
419
+                                "sub": []
420
+                            },
421
+                            {
422
+                                "name": "rx-vlan-offload",
423
+                                "state": null,
424
+                                "sub": []
425
+                            },
426
+                            {
427
+                                "name": "generic-receive-offload",
428
+                                "state": null,
429
+                                "sub": []
430
+                            },
431
+                            {
432
+                                "name": "generic-segmentation-offload",
433
+                                "state": null,
434
+                                "sub": []
435
+                            },
436
+                            {
437
+                                "name": "tcp-segmentation-offload",
438
+                                "state": null,
439
+                                "sub": [
440
+                                    {
441
+                                        "name": "tx-tcp-segmentation",
442
+                                        "state": null,
443
+                                        "sub": []
444
+                                    }
445
+                                ]
446
+                            },
447
+                            {
448
+                                "name": "scatter-gather",
449
+                                "state": null,
450
+                                "sub": [
451
+                                    {
452
+                                        "name": "tx-scatter-gather",
453
+                                        "state": null,
454
+                                        "sub": []
455
+                                    }
456
+                                ]
457
+                            },
458
+                            {
459
+                                "name": "tx-checksumming",
460
+                                "state": null,
461
+                                "sub": [
462
+                                    {
463
+                                        "name": "tx-checksum-ip-generic",
464
+                                        "state": null,
465
+                                        "sub": []
466
+                                    }
467
+                                ]
468
+                            },
469
+                            {
470
+                                "name": "rx-checksumming",
471
+                                "state": null,
472
+                                "sub": []
473
+                            }
474
+                        ],
475
+                        "pxe": false,
476
+                        "state": "down"
477
+                    },
478
+                    {
479
+                        "bus_info": "0000:00:07.0",
480
+                        "current_speed": 1000,
481
+                        "driver": "e1000",
482
+                        "interface_properties": {
483
+                            "numa_node": null,
484
+                            "pci_id": "8086:100e",
485
+                            "sriov": {
486
+                                "available": false,
487
+                                "pci_id": "",
488
+                                "sriov_totalvfs": 0
489
+                            }
490
+                        },
491
+                        "mac": "<%= node['nic5_mac'] %>",
492
+                        "max_speed": 1000,
493
+                        "name": "enp0s7",
494
+                        "offloading_modes": [
495
+                            {
496
+                                "name": "rx-all",
497
+                                "state": null,
498
+                                "sub": []
499
+                            },
500
+                            {
501
+                                "name": "rx-fcs",
502
+                                "state": null,
503
+                                "sub": []
504
+                            },
505
+                            {
506
+                                "name": "tx-nocache-copy",
507
+                                "state": null,
508
+                                "sub": []
509
+                            },
510
+                            {
511
+                                "name": "rx-vlan-offload",
512
+                                "state": null,
513
+                                "sub": []
514
+                            },
515
+                            {
516
+                                "name": "generic-receive-offload",
517
+                                "state": null,
518
+                                "sub": []
519
+                            },
520
+                            {
521
+                                "name": "generic-segmentation-offload",
522
+                                "state": null,
523
+                                "sub": []
524
+                            },
525
+                            {
526
+                                "name": "tcp-segmentation-offload",
527
+                                "state": null,
528
+                                "sub": [
529
+                                    {
530
+                                        "name": "tx-tcp-segmentation",
531
+                                        "state": null,
532
+                                        "sub": []
533
+                                    }
534
+                                ]
535
+                            },
536
+                            {
537
+                                "name": "scatter-gather",
538
+                                "state": null,
539
+                                "sub": [
540
+                                    {
541
+                                        "name": "tx-scatter-gather",
542
+                                        "state": null,
543
+                                        "sub": []
544
+                                    }
545
+                                ]
546
+                            },
547
+                            {
548
+                                "name": "tx-checksumming",
549
+                                "state": null,
550
+                                "sub": [
551
+                                    {
552
+                                        "name": "tx-checksum-ip-generic",
553
+                                        "state": null,
554
+                                        "sub": []
555
+                                    }
556
+                                ]
557
+                            },
558
+                            {
559
+                                "name": "rx-checksumming",
560
+                                "state": null,
561
+                                "sub": []
562
+                            }
563
+                        ],
564
+                        "pxe": false,
565
+                        "state": "down"
566
+                    }
567
+                ],
568
+                "disks": [
569
+                    {
570
+                        "model": "TOSHIBA MK1002TS",
571
+                        "name": "sda",
572
+                        "disk": "sda",
573
+                        "size": 1000204886016
574
+                    },
575
+                    {
576
+                        "model": "TOSHIBA MK1002TS",
577
+                        "name": "sdb",
578
+                        "disk": "sdb",
579
+                        "size": 1000204886016
580
+                    },
581
+                    {
582
+                        "model": "TOSHIBA MK1002TS",
583
+                        "name": "sdc",
584
+                        "disk": "sdc",
585
+                        "size": 1000204886016
586
+                    },
587
+                    {
588
+                        "model": "TOSHIBA MK1002TS",
589
+                        "name": "sdd",
590
+                        "disk": "sdd",
591
+                        "size": 1000204886016
592
+                    },
593
+                    {
594
+                        "model": "Virtual Floppy0",
595
+                        "name": "sde",
596
+                        "disk": "sde",
597
+                        "size": 0
598
+                    },
599
+                    {
600
+                        "model": "Virtual HDisk0",
601
+                        "name": "sdf",
602
+                        "disk": "sdf",
603
+                        "size": 0
604
+                    }
605
+                ],
606
+                "system": {
607
+                    "product": "X9DRW",
608
+                    "family": "To be filled by O.E.M.",
609
+                    "fqdn": "srv08-srt.srt.mirantis.net",
610
+                    "version": "0123456789",
611
+                    "serial": "0123456789",
612
+                    "manufacturer": "Supermicro"
613
+                },
614
+                "memory": {
615
+                    "slots": 1,
616
+                    "total": 137455730688,
617
+                    "maximum_capacity": 274894684160,
618
+                    "devices": [
619
+                        {
620
+                            "frequency": 1333,
621
+                            "type": "DDR3",
622
+                            "size": 8589934592
623
+                        },
624
+                        {
625
+                            "frequency": 1333,
626
+                            "type": "DDR3",
627
+                            "size": 8589934592
628
+                        },
629
+                        {
630
+                            "frequency": 1333,
631
+                            "type": "DDR3",
632
+                            "size": 8589934592
633
+                        },
634
+                        {
635
+                            "frequency": 1333,
636
+                            "type": "DDR3",
637
+                            "size": 8589934592
638
+                        },
639
+                        {
640
+                            "frequency": 1333,
641
+                            "type": "DDR3",
642
+                            "size": 8589934592
643
+                        },
644
+                        {
645
+                            "frequency": 1333,
646
+                            "type": "DDR3",
647
+                            "size": 8589934592
648
+                        },
649
+                        {
650
+                            "frequency": 1333,
651
+                            "type": "DDR3",
652
+                            "size": 8589934592
653
+                        },
654
+                        {
655
+                            "frequency": 1333,
656
+                            "type": "DDR3",
657
+                            "size": 8589934592
658
+                        },
659
+                        {
660
+                            "frequency": 1333,
661
+                            "type": "DDR3",
662
+                            "size": 8589934592
663
+                        },
664
+                        {
665
+                            "frequency": 1333,
666
+                            "type": "DDR3",
667
+                            "size": 8589934592
668
+                        },
669
+                        {
670
+                            "frequency": 1333,
671
+                            "type": "DDR3",
672
+                            "size": 8589934592
673
+                        },
674
+                        {
675
+                            "frequency": 1333,
676
+                            "type": "DDR3",
677
+                            "size": 8589934592
678
+                        },
679
+                        {
680
+                            "frequency": 1333,
681
+                            "type": "DDR3",
682
+                            "size": 8589934592
683
+                        },
684
+                        {
685
+                            "frequency": 1333,
686
+                            "type": "DDR3",
687
+                            "size": 8589934592
688
+                        },
689
+                        {
690
+                            "frequency": 1333,
691
+                            "type": "DDR3",
692
+                            "size": 8589934592
693
+                        },
694
+                        {
695
+                            "frequency": 1333,
696
+                            "type": "DDR3",
697
+                            "size": 8589934592
698
+                        },
699
+                        {
700
+                            "type": "Flash",
701
+                            "size": 16777216
702
+                        }
703
+                    ]
704
+                },
705
+                "numa_topology": {
706
+                    "numa_nodes": [
707
+                        {
708
+                            "id": 0,
709
+                            "memory": 85899345920,
710
+                            "cpus": [
711
+                                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
712
+                            ]
713
+                        },
714
+                        {
715
+                            "id": 1,
716
+                            "memory": 51539607552,
717
+                            "cpus": [
718
+                                12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23
719
+                            ]
720
+                        }
721
+                    ],
722
+                    "supported_hugepages": [2048, 1048576],
723
+                    "distances": [
724
+                        ["1.0", "2.1"],
725
+                        ["2.1", "1.0"]
726
+                    ]
727
+                }
728
+            },
729
+            "timestamp": "",
730
+            "progress": 0,
731
+            "pending_deletion": false,
732
+            "os_platform": "ubuntu",
733
+            "manufacturer": "Supermicro"
734
+        }
735
+    }<% if node != nodes.last %>,<% end %>
736
+<% end %>
737
+]

+ 28
- 0
utils/generate_nodes_fixtures.rb View File

@@ -0,0 +1,28 @@
1
+#!/usr/bin/env ruby
2
+
3
+require 'erb'
4
+
5
+nodes    = []
6
+ip       = ARGV[0].to_s || "10.20.0.100"
7
+ip_tpl   = ip.split('.')[0,3].join('.')
8
+ip_start = ip.split('.').last
9
+nodenum = ARGV[1].to_i || 10
10
+
11
+for i in 0..(nodenum.to_i - 1) do
12
+  pk = ip_start.to_i + i
13
+  node = {
14
+    "ip"       => ip_tpl + "." + pk.to_s,
15
+    "pk"       => pk,
16
+    "id"       => pk,
17
+    "main_mac" => (1..6).map{"%0.2x"%rand(256)}.join(":"),
18
+    "nic2_mac" => (1..6).map{"%0.2x"%rand(256)}.join(":"),
19
+    "nic3_mac" => (1..6).map{"%0.2x"%rand(256)}.join(":"),
20
+    "nic4_mac" => (1..6).map{"%0.2x"%rand(256)}.join(":"),
21
+    "nic5_mac" => (1..6).map{"%0.2x"%rand(256)}.join(":")
22
+  }
23
+  nodes << node
24
+end
25
+
26
+nodes_template = File.read("fixtures/nodes_template.erb")
27
+renderer = ERB.new(nodes_template)
28
+puts output = renderer.result()

+ 128
- 17
utils/generate_yamls.sh View File

@@ -1,13 +1,46 @@
1 1
 #!/bin/bash
2 2
 #
3 3
 # Use this script to generate and save astute.yaml fixtures.
4
-# Should be executed on Fuel node with at least 7 discovered
5
-# and unused (not assigned to any env) nodes.
6
-#
4
+# Should be executed on Fuel node with 'advanced' feature enabled
5
+# (see FEATURE_GROUPS list in /etc/nailgun/settings.yaml)
6
+
7
+CWD=$(cd `dirname $0` && pwd -P)
7 8
 
8 9
 mkdir ./yamls
9 10
 rm -f ./yamls/*
10 11
 
12
+function generate_fake_nodes_fixtures {
13
+  # $1 - first IP of admin network to start generate nodes from
14
+  # $2 - number of nodes to generate
15
+  # $3 - name of fixture
16
+  $CWD/generate_nodes_fixtures.rb $1 $2 > $CWD/fixtures/${3}.json
17
+}
18
+
19
+function create_fake_nodes {
20
+  manage.py loaddata $CWD/fixtures/${1}.json
21
+}
22
+
23
+function clean_fake_nodes {
24
+  fuel nodes | grep -q 'discover | fnode-' &&
25
+    fuel nodes | awk '/discover \| fnode-/{ print $1 }' | xargs fuel node --delete-from-db --force --node
26
+}
27
+
28
+function admin_net_tpl {
29
+  fuel network-group list | awk '/^1 /{print $9}' | sed -e 's/\.[[:digit:]]\+$//'
30
+}
31
+
32
+function id_of_role {
33
+  env=$1
34
+  role=$2
35
+  yaml=`grep -rl node_roles: deployment_$env/*yaml | head -n1`
36
+  ruby -ryaml -e '
37
+  astute = YAML.load(File.read(ARGV[0]))
38
+  role = ARGV[1]
39
+  node = astute["network_metadata"]["nodes"].find{|key, hash| hash["node_roles"].include?("#{role}") }
40
+  puts node.last["uid"]
41
+  ' $yaml $role
42
+}
43
+
11 44
 function enable_ceph {
12 45
   fuel env --attributes --env $1 --download
13 46
   ruby -ryaml -e '
@@ -23,6 +56,16 @@ function enable_ceph {
23 56
   rm -rf "cluster_$1"
24 57
 }
25 58
 
59
+function enable_cblock {
60
+  fuel env --attributes --env $1 --download
61
+  ruby -ryaml -e '
62
+  attr = YAML.load(File.read(ARGV[0]))
63
+  attr["editable"]["storage"]["volumes_block_device"]["value"] = true
64
+  File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
65
+  fuel env --attributes --env $1 --upload
66
+  rm -rf "cluster_$1"
67
+}
68
+
26 69
 function enable_murano_sahara_ceilometer {
27 70
   fuel env --attributes --env $1 --download
28 71
   ruby -ryaml -e '
@@ -88,7 +131,12 @@ function enable_vms_conf {
88 131
 }
89 132
 
90 133
 function list_free_nodes {
91
-  fuel nodes 2>/dev/null | grep discover | grep None | awk '{print $1}'
134
+  # list unused nodes from the list of fake nodes
135
+  if [ -n "$1" ] ; then
136
+    fuel nodes 2>/dev/null | grep discover | grep None | grep 'fnode-' | grep $1 | awk '{print $1}'
137
+  else
138
+    fuel nodes 2>/dev/null | grep discover | grep None | grep 'fnode-' | awk '{print $1}'
139
+  fi
92 140
 }
93 141
 
94 142
 function save_yamls {
@@ -100,10 +148,23 @@ function envid {
100 148
   fuel env 2>/dev/null | grep $1 | awk '{print $1}'
101 149
 }
102 150
 
151
+function fix_node_names {
152
+  file=$1
153
+  ruby -ryaml -e '
154
+  astute = YAML.load(File.read(ARGV[0]))
155
+  astute["network_metadata"]["nodes"].each do |key, hash|
156
+    wrong = hash["name"]
157
+    puts "\"s/#{wrong}/#{key}/g\""
158
+  end
159
+  ' $file | xargs -I {} sed -e {} -i $file
160
+}
161
+
103 162
 function store_yamls {
104 163
   for role in $3 ; do
105
-    src=`ls deployment_$1/${role}_*.yaml | head -n1`
164
+    id=`id_of_role $1 $role`
165
+    src="deployment_$1/${id}.yaml"
106 166
     cp $src ./yamls/$2-$role.yaml
167
+    fix_node_names ./yamls/$2-$role.yaml
107 168
   done
108 169
 }
109 170
 
@@ -112,6 +173,10 @@ function generate_yamls {
112 173
   name=$2
113 174
   roles=($3)
114 175
 
176
+  # Create fake nodes for our fixtures
177
+  generate_fake_nodes_fixtures $admin_first_ip 10 default_nodegroup
178
+  create_fake_nodes default_nodegroup
179
+
115 180
   if [ "${name/ceph}" != "$name" ] ; then
116 181
     enable_ceph $env
117 182
   fi
@@ -133,9 +198,22 @@ function generate_yamls {
133 198
   if [ "${name/public_ssl}" != "$name" ] ; then
134 199
     enable_public_ssl $env
135 200
   fi
201
+  if [ "${name/cblock}" != "$name" ] ; then
202
+    enable_cblock $env
203
+  fi
204
+
205
+  if [ "${name/multirack}" != "$name" ] ; then
206
+    # move controllers to custom node group
207
+    for id in `list_free_nodes 9.9.9` ; do
208
+      if [ "${roles[0]}" = "controller" ] ; then
209
+        fuel --env $env node set --node $id --role ${roles[0]}
210
+        roles=("${roles[@]:1}")
211
+      fi
212
+    done
213
+  fi
136 214
 
137 215
   for id in `list_free_nodes` ; do
138
-    if ! [ -z "${roles[0]}" ] ; then
216
+    if [ -n "${roles[0]}" ] ; then
139 217
       fuel --env $env node set --node $id --role ${roles[0]}
140 218
       roles=("${roles[@]:1}")
141 219
       sleep 1
@@ -153,12 +231,40 @@ function generate_yamls {
153 231
 
154 232
 function clean_env {
155 233
   env=`envid $1`
156
-  fuel env --delete --env $env
157
-  rm -rf "cluster_$1"
158
-  rm -rf "deployment_$env"
159
-  sleep 80
234
+  if fuel env --env $env | grep $1 ; then
235
+    fuel env --delete --env $env
236
+    rm -rf "cluster_$env"
237
+    rm -rf "deployment_$env"
238
+    rm -f network_${env}.yaml
239
+    sleep 80
240
+  fi
241
+  clean_fake_nodes
160 242
 }
161 243
 
244
+function add_nodegroup {
245
+  env=`envid $1`
246
+  name=$2
247
+
248
+  fuel --env $env nodegroup --create --name $name
249
+}
250
+
251
+function update_default_nodegroup {
252
+  env=`envid $1`
253
+  fuel network --env $env download
254
+  sed -e 's/172\.16\.0\./10.11.1./g' -i network_${env}.yaml
255
+  sed -e 's/192\.168\.0\./10.11.2./g' -i network_${env}.yaml
256
+  sed -e 's/192\.168\.1\./10.11.3./g' -i network_${env}.yaml
257
+  sed -e 's/192\.168\.2\./10.11.4./g' -i network_${env}.yaml
258
+  fuel network --env $env upload
259
+}
260
+
261
+clean_fake_nodes
262
+sleep 1
263
+
264
+# Get some context
265
+admin_net=$(admin_net_tpl)
266
+admin_first_ip="${admin_net}.100"
267
+
162 268
 # Neutron vlan ceph
163 269
 fuel env --create --name test_neutron_vlan --rel 2 --net vlan
164 270
 generate_yamls 'test_neutron_vlan' 'neut_vlan.ceph' 'controller controller controller compute ceph-osd ceph-osd' 'primary-controller compute ceph-osd'
@@ -166,7 +272,7 @@ clean_env 'test_neutron_vlan'
166 272
 
167 273
 # Neutron vlan addons
168 274
 fuel env --create --name test_neutron_vlan --rel 2 --net vlan
169
-generate_yamls 'test_neutron_vlan' 'neut_vlan.murano.sahara.ceil' 'controller controller compute mongo mongo cinder cinder-block-device' 'primary-controller controller compute primary-mongo mongo cinder cinder-block-device'
275
+generate_yamls 'test_neutron_vlan' 'neut_vlan.cblock.murano.sahara.ceil' 'controller controller compute mongo mongo cinder cinder-block-device' 'primary-controller controller compute primary-mongo mongo cinder cinder-block-device'
170 276
 clean_env 'test_neutron_vlan'
171 277
 
172 278
 # Neutron-dvr vlan
@@ -179,10 +285,10 @@ fuel env --create --name test_neutron_tun --rel 2 --net tun
179 285
 generate_yamls 'test_neutron_tun' 'neut_tun.ceph.murano.sahara.ceil' 'controller controller compute ceph-osd ceph-osd mongo mongo' 'primary-controller controller compute ceph-osd primary-mongo mongo'
180 286
 clean_env 'test_neutron_tun'
181 287
 
182
-# Neutron tun ironic
183
-fuel env --create --name test_neutron_tun --rel 2 --net tun
184
-generate_yamls 'test_neutron_tun' 'neut_tun.ironic' 'controller ironic' 'primary-controller ironic'
185
-clean_env 'test_neutron_tun'
288
+# Neutron vlan ironic
289
+fuel env --create --name test_neutron_vlan --rel 2 --net vlan
290
+generate_yamls 'test_neutron_vlan' 'neut_tun.ironic' 'controller ironic' 'primary-controller ironic'
291
+clean_env 'test_neutron_vlan'
186 292
 
187 293
 # Neutron-l3ha tun + nova_quota
188 294
 fuel env --create --name test_neutron_tun --rel 2 --net tun
@@ -194,7 +300,12 @@ fuel env --create --name test_neutron_tun --rel 2 --net tun
194 300
 generate_yamls 'test_neutron_tun' 'neut_tun.vms_conf' 'virt compute' 'virt'
195 301
 clean_env 'test_neutron_tun'
196 302
 
197
-# Neutron tun, addons, ceph, public and hotizon ssl
303
+# Multirack, Neutron tun, addons, ceph, public and horizon ssl
198 304
 fuel env --create --name test_neutron_tun --rel 2 --net tun
199
-generate_yamls 'test_neutron_tun' 'neut_tun.murano.sahara.ceil.public_ssl' 'controller controller mongo mongo compute ceph-osd ceph-osd' 'primary-controller compute ceph-osd primary-mongo'
305
+update_default_nodegroup 'test_neutron_tun'
306
+add_nodegroup 'test_neutron_tun' 'custom_group1'
307
+generate_fake_nodes_fixtures 9.9.9.150 5 custom_nodegroup
308
+create_fake_nodes custom_nodegroup
309
+generate_yamls 'test_neutron_tun' 'neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl' 'controller controller controller mongo mongo compute ceph-osd ceph-osd' 'primary-controller compute ceph-osd primary-mongo'
200 310
 clean_env 'test_neutron_tun'
311
+

Loading…
Cancel
Save