Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport default.yaml split patches #394

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/automation-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# We are using yamale to validate files
# https://github.com/23andMe/Yamale
---
vas: map(include('_architecture'), key=str())
vas: map(include('_architecture'), key=str(), min=1, max=1)

---
# Define various nested types
Expand Down
2 changes: 2 additions & 0 deletions .ci/validate-schema-paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ def __run_file(self, f):
content = yaml.safe_load(fh)
for scenario in content['vas']:
print(f' Checking scenario: {scenario}')
assert (rel.name == f'{scenario}.yaml'), \
f'!! {rel.name} does not match {scenario}.yaml'
self.__validate(content['vas'][scenario])

def __validate(self, scenario):
Expand Down
20 changes: 20 additions & 0 deletions automation/mocks/nfv-ovs-dpdk-sriov-hci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
cifmw_baremetal_hosts:
compute-0:
connection: ipmi://10.10.100.100
boot_mode: UEFI
nics:
- mac: "89:9a:b7:cb:4a:3f"
network: provision
credentials_file: "/home/user/foo.yaml"
root_device_hint_field: "wwnWithExtension"
root_device_hint: "0x6509a4c0ac82ff002dbccf463196ca41"
compute-1:
connection: ipmi://10.10.100.101
boot_mode: UEFI
nics:
- mac: "53:b0:4d:06:56:ea"
network: provision
credentials_file: "/home/user/foo.yaml"
root_device_hint_field: "wwnWithExtension"
root_device_hint: "0x55cd2e414e372c06"
78 changes: 0 additions & 78 deletions automation/vars/bgp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,81 +51,3 @@ vas:
- name: edpm-deployment-values
src_file: values.yaml
build_output: deployment-dataplane.yaml
bgp_dt01:
stages:
- pre_stage_run:
- name: Apply taint on worker-3
type: cr
definition:
spec:
taints:
- effect: NoSchedule
key: testOperator
value: 'true'
- effect: NoExecute
key: testOperator
value: 'true'
kind: Node
resource_name: worker-3
state: patched
path: examples/dt/bgp/bgp_dt01/control-plane/nncp
wait_conditions:
- >-
oc -n openstack wait nncp
-l osp/nncm-config-type=standard
--for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
--timeout=60s
values:
- name: network-values
src_file: values.yaml
build_output: nncp.yaml

- path: examples/dt/bgp/bgp_dt01/control-plane
wait_conditions:
- >-
oc -n openstack wait openstackcontrolplane
controlplane
--for condition=Ready
--timeout=30m
values:
- name: network-values
src_file: nncp/values.yaml
- name: service-values
src_file: service-values.yaml
build_output: control-plane.yaml

- path: examples/dt/bgp/bgp_dt01/edpm/networkers
wait_conditions:
- >-
oc -n openstack wait openstackdataplanenodeset
networker-nodes
--for condition=SetupReady
--timeout=600s
values:
- name: edpm-networker-nodeset-values
src_file: values.yaml
build_output: edpm-networker-nodeset.yaml

- path: examples/dt/bgp/bgp_dt01/edpm/computes
wait_conditions:
- >-
oc -n openstack wait openstackdataplanenodeset
compute-nodes
--for condition=SetupReady
--timeout=600s
values:
- name: edpm-compute-nodeset-values
src_file: values.yaml
build_output: edpm-compute-nodeset.yaml

- path: examples/dt/bgp/bgp_dt01/edpm/deployment
wait_conditions:
- >-
oc -n openstack wait openstackdataplanedeployment
edpm-deployment
--for condition=Ready
--timeout=3800s
values:
- name: edpm-deployment-values
src_file: values.yaml
build_output: edpm-deployment.yaml
80 changes: 80 additions & 0 deletions automation/vars/bgp_dt01.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
---
vas:
bgp_dt01:
stages:
- pre_stage_run:
- name: Apply taint on worker-3
type: cr
definition:
spec:
taints:
- effect: NoSchedule
key: testOperator
value: 'true'
- effect: NoExecute
key: testOperator
value: 'true'
kind: Node
resource_name: worker-3
state: patched
path: examples/dt/bgp/bgp_dt01/control-plane/nncp
wait_conditions:
- >-
oc -n openstack wait nncp
-l osp/nncm-config-type=standard
--for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
--timeout=60s
values:
- name: network-values
src_file: values.yaml
build_output: nncp.yaml

- path: examples/dt/bgp/bgp_dt01/control-plane
wait_conditions:
- >-
oc -n openstack wait openstackcontrolplane
controlplane
--for condition=Ready
--timeout=30m
values:
- name: network-values
src_file: nncp/values.yaml
- name: service-values
src_file: service-values.yaml
build_output: control-plane.yaml

- path: examples/dt/bgp/bgp_dt01/edpm/networkers
wait_conditions:
- >-
oc -n openstack wait openstackdataplanenodeset
networker-nodes
--for condition=SetupReady
--timeout=600s
values:
- name: edpm-networker-nodeset-values
src_file: values.yaml
build_output: edpm-networker-nodeset.yaml

- path: examples/dt/bgp/bgp_dt01/edpm/computes
wait_conditions:
- >-
oc -n openstack wait openstackdataplanenodeset
compute-nodes
--for condition=SetupReady
--timeout=600s
values:
- name: edpm-compute-nodeset-values
src_file: values.yaml
build_output: edpm-compute-nodeset.yaml

- path: examples/dt/bgp/bgp_dt01/edpm/deployment
wait_conditions:
- >-
oc -n openstack wait openstackdataplanedeployment
edpm-deployment
--for condition=Ready
--timeout=3800s
values:
- name: edpm-deployment-values
src_file: values.yaml
build_output: edpm-deployment.yaml
Loading