Skip to content

Commit 24fe2b4

Browse files
committed
Drop redhat service from default nodeset samples
The service requires rhel nodes to run which we don't have upstream and so is not being tested. Also enabling this service requires additional vars like activationkey,token, username etc. Also it broke some downstream jobs which running older version of operators and using these upstream samples. Related-Issue: OSPCIX-596
1 parent 68357b2 commit 24fe2b4

5 files changed

Lines changed: 1 addition & 8 deletions

apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,6 @@ spec:
900900
type: integer
901901
services:
902902
default:
903-
- redhat
904903
- download-cache
905904
- bootstrap
906905
- configure-network

apis/dataplane/v1beta1/openstackdataplanenodeset_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type OpenStackDataPlaneNodeSetSpec struct {
6161
NetworkAttachments []string `json:"networkAttachments,omitempty"`
6262

6363
// +kubebuilder:validation:Optional
64-
// +kubebuilder:default={redhat,download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-metadata,libvirt,nova,telemetry}
64+
// +kubebuilder:default={download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-metadata,libvirt,nova,telemetry}
6565
// Services list
6666
Services []string `json:"services"`
6767

config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,6 @@ spec:
900900
type: integer
901901
services:
902902
default:
903-
- redhat
904903
- download-cache
905904
- bootstrap
906905
- configure-network

config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ spec:
88
- name: ANSIBLE_FORCE_COLOR
99
value: "True"
1010
services:
11-
- redhat
1211
- bootstrap
1312
- download-cache
1413
- configure-network

tests/functional/dataplane/openstackdataplanenodeset_controller_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
355355
},
356356
},
357357
Services: []string{
358-
"redhat",
359358
"download-cache",
360359
"bootstrap",
361360
"configure-network",
@@ -405,7 +404,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
405404
BeforeEach(func() {
406405
nodeSetSpec := DefaultDataPlaneNoNodeSetSpec(tlsEnabled)
407406
nodeSetSpec["services"] = []string{
408-
"redhat",
409407
"download-cache",
410408
"bootstrap",
411409
"configure-network",
@@ -496,7 +494,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
496494
},
497495
},
498496
Services: []string{
499-
"redhat",
500497
"download-cache",
501498
"bootstrap",
502499
"configure-network",
@@ -951,7 +948,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
951948
},
952949
},
953950
Services: []string{
954-
"redhat",
955951
"download-cache",
956952
"bootstrap",
957953
"configure-network",

0 commit comments

Comments
 (0)