Adapt tests for Openstack config drive option

infonova · Oct 13, 2021 · 182f070 · 182f070
1 parent da84492
commit 182f070
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 6 deletions.
diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go
@@ -54,6 +54,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -108,6 +111,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -190,6 +196,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -309,6 +318,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Topology: &kops.TopologySpec{
@@ -429,7 +441,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -547,6 +563,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -625,6 +644,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -681,6 +703,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 							Router: &kops.OpenstackRouter{
 								ExternalNetwork: fi.String("test"),
 							},
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
 						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
@@ -759,7 +784,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -798,7 +827,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -839,7 +872,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -878,7 +915,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{
@@ -917,7 +958,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput {
 				Spec: kops.ClusterSpec{
 					MasterPublicName: "master-public-name",
 					CloudConfig: &kops.CloudConfiguration{
-						Openstack: &kops.OpenstackConfiguration{},
+						Openstack: &kops.OpenstackConfiguration{
+							Metadata: &kops.OpenstackMetadata{
+								ConfigDrive: fi.Bool(false),
+							},
+						},
 					},
 					Subnets: []kops.ClusterSubnetSpec{
 						{

diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
@@ -1,6 +1,7 @@
 Name: node
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.2-4
 FloatingIP: null
 ForAPIServer: false

diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml
@@ -1,6 +1,7 @@
 Name: node
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.2-4
 FloatingIP: null
 ForAPIServer: false

diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml
@@ -1,6 +1,7 @@
 Name: node
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.2-4
 FloatingIP: null
 ForAPIServer: false

diff --git a/...servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/...servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml
@@ -45,6 +45,7 @@ Lifecycle: Sync
 Name: fip-node-3-cluster
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: true
@@ -124,6 +125,7 @@ UserData:
     Name: master
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: true
@@ -203,6 +205,7 @@ UserData:
     Name: master
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: true
@@ -282,6 +285,7 @@ UserData:
     Name: master
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false
@@ -354,6 +358,7 @@ UserData:
     Name: node
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false
@@ -426,6 +431,7 @@ UserData:
     Name: node
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false

diff --git a/.../servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/.../servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml
@@ -52,6 +52,7 @@ Lifecycle: Sync
 Name: fip-node-c-1-cluster
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -119,6 +120,7 @@ UserData:
     Name: master-a
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -186,6 +188,7 @@ UserData:
     Name: master-b
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -253,6 +256,7 @@ UserData:
     Name: master-c
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false
@@ -325,6 +329,7 @@ UserData:
     Name: node-a
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false
@@ -397,6 +402,7 @@ UserData:
     Name: node-b
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false

diff --git a/...l/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/...l/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml
@@ -53,6 +53,7 @@ Lifecycle: Sync
 Name: fip-node-c-1-cluster
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: true
@@ -132,6 +133,7 @@ UserData:
     Name: master-a
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: true
@@ -211,6 +213,7 @@ UserData:
     Name: master-b
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: true
@@ -290,6 +293,7 @@ UserData:
     Name: master-c
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false
@@ -362,6 +366,7 @@ UserData:
     Name: node-a
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false
@@ -434,6 +439,7 @@ UserData:
     Name: node-b
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP:
   ForAPIServer: false

diff --git a/...ackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml b/...ackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml
@@ -11,6 +11,7 @@ Name: node-b
 Name: node-c
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -84,6 +85,7 @@ UserData:
     Name: master-a
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -157,6 +159,7 @@ UserData:
     Name: master-b
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -230,6 +233,7 @@ UserData:
     Name: master-c
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -296,6 +300,7 @@ UserData:
     Name: node-a
 ---
 AvailabilityZone: zone-2
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -362,6 +367,7 @@ UserData:
     Name: node-b
 ---
 AvailabilityZone: zone-3
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false

diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml
@@ -5,6 +5,7 @@ Name: master
 Name: node
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -70,6 +71,7 @@ UserData:
     Name: bastion
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false
@@ -143,6 +145,7 @@ UserData:
     Name: master
 ---
 AvailabilityZone: zone-1
+ConfigDrive: false
 Flavor: blc.1-2
 FloatingIP: null
 ForAPIServer: false