Skip to content
This repository has been archived by the owner on Jun 25, 2024. It is now read-only.

Updating samples #401

Merged
merged 1 commit into from
Sep 12, 2023
+9 −15
Merged

Updating samples #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion config/samples/dataplane_v1beta1_openstackdataplane_baremetal_with_ipam.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion config/samples/dataplane_v1beta1_openstackdataplane_with_ipam.yaml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ spec:
hostName: edpm-compute-0
ansible:
ansibleHost: 192.168.122.100
ansibleUser: root
slagle marked this conversation as resolved.
Show resolved Hide resolved
ansibleVars:
ctlplane_ip: 192.168.122.100
internal_api_ip: 172.17.0.100
Expand All @@ -37,7 +36,7 @@ spec:
fqdn_internal_api: edpm-compute-0.example.com
managementNetwork: ctlplane
ansible:
ansibleUser: root
ansibleUser: cloud-admin
ansiblePort: 22
ansibleVars:
service_net_map:
Expand Down
5 changes: 1 addition & 4 deletions config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: OpenStackDataPlaneNodeSet
metadata:
name: openstack-edpm-ipam
spec:
ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
env:
- name: ANSIBLE_FORCE_COLOR
value: "True"
Expand All @@ -22,6 +21,7 @@ spec:
- libvirt
- nova
nodeTemplate:
ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
nodes:
edpm-compute-0:
hostName: edpm-compute-0
Expand Down Expand Up @@ -88,9 +88,6 @@ spec:
edpm_ovn_metadata_agent_metadata_agent_DEFAULT_nova_metadata_host: 127.0.0.1
edpm_ovn_metadata_agent_metadata_agent_DEFAULT_metadata_proxy_shared_secret: 12345678
edpm_ovn_metadata_agent_DEFAULT_bind_host: 127.0.0.1
ctlplane_dns_nameservers:
- 192.168.122.1
dns_search_domains: []
edpm_ovn_dbs:
- 192.168.122.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I had issues with 192.168.122.0/24 which is why I ended up on 192.168.111.0/24 I notice the rdo checks haven't run for this change so we might not be seeing the issue with addressing. Provided this actually works in CI and doesn't require some other change, I have no other preference to any particular subnet. Just calling it out in-case there's more required for this subnet change.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is another thing that is different when baremetal or not: 9b19caf

registry_url: quay.io/podified-antelope-centos9
Expand Down
2 changes: 1 addition & 1 deletion docs/composable_services.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ service to execute for the `edpm-compute` `NodeSet`.
ansible:
ansibleHost: 172.20.12.67
ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
ansibleUser: root
ansibleUser: cloud-admin
ansibleVars:
ansible_ssh_transfer_method: scp
ctlplane_ip: 172.20.12.67
Expand Down
4 changes: 2 additions & 2 deletions docs/inheritance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
network: ctlplane
nodeTemplate:
ansiblePort: 22
ansibleUser: root
ansibleUser: cloud-admin
managed: false
managementNetwork: ctlplane
networkConfig:
Expand All @@ -46,7 +46,7 @@ following from the `nodeTemplate` in node 1 and 2 above.

```yaml
ansiblePort: 22
ansibleUser: root
ansibleUser: cloud-admin
managed: false
managementNetwork: ctlplane
networkConfig:
Expand Down
4 changes: 2 additions & 2 deletions tests/kuttl/tests/dataplane-create-test/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
nodeTemplate:
ansible:
ansiblePort: 22
ansibleUser: root
ansibleUser: cloud-admin
ansibleVars:
ctlplane_dns_nameservers:
- 192.168.122.1
Expand Down Expand Up @@ -92,7 +92,7 @@ spec:
edpm-compute-0:
ansible:
ansibleHost: 192.168.122.100
ansibleUser: root
ansibleUser: cloud-admin
ansibleVars:
ctlplane_ip: 192.168.122.100
fqdn_internal_api: edpm-compute-0.example.com
Expand Down
4 changes: 2 additions & 2 deletions tests/kuttl/tests/dataplane-create-test/00-dataplane-create.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
hostName: edpm-compute-0
ansible:
ansibleHost: 192.168.122.100
ansibleUser: root
ansibleUser: cloud-admin
ansibleVars:
ctlplane_ip: 192.168.122.100
internal_api_ip: 172.17.0.100
Expand All @@ -37,7 +37,7 @@ spec:
fqdn_internal_api: edpm-compute-0.example.com
managementNetwork: ctlplane
ansible:
ansibleUser: root
ansibleUser: cloud-admin
ansiblePort: 22
ansibleVars:
service_net_map:
Expand Down