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

Conversation

fao89
Copy link
Collaborator

@fao89 fao89 commented Sep 8, 2023

  • remove the symlinks
  • update IPAM sample

@openshift-ci openshift-ci bot requested review from bshephar and stuggi September 8, 2023 13:05
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fao89

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@softwarefactory-project-zuul
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/983287b3c0b54df9bb5c413f479bcba9

openstack-k8s-operators-content-provider FAILURE in 11m 38s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ dataplane-operator-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

@fao89
Copy link
Collaborator Author

fao89 commented Sep 8, 2023

/test dataplane-operator-build-deploy-kuttl

- name: Storage
subnetName: subnet1
- name: Tenant
subnetName: subnet1
managementNetwork: ctlplane
Copy link
Collaborator

Choose a reason for hiding this comment

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

this is optional. should we drop it?

managementNetwork: ctlplane
ansible:
ansibleUser: cloud-admin
ansibleUser: root
Copy link
Collaborator

Choose a reason for hiding this comment

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

Aren't we sticking with cloud-admin?

Copy link
Collaborator Author

@fao89 fao89 Sep 8, 2023

Choose a reason for hiding this comment

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

I know we use cloud-admin for baremetal, but I believe install_yamls still using root: https://github.com/openstack-k8s-operators/install_yamls/blob/main/devsetup/scripts/gen-edpm-compute-node.sh#L220

Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably decide what we actually want here. With tripleo, we went through the stages of heat-admin and tripleo-admin. I guess we want to standardise on something similar here? But probably not root right?

Understand the install_yamls situation. Just saying that we probably want to aim for a non-root user before we GA.

managementNetwork: ctlplane
ansible:
ansibleUser: cloud-admin
ansibleUser: root
ansiblePort: 22
Copy link
Collaborator

Choose a reason for hiding this comment

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

this is the default. should we drop it?

managementNetwork: ctlplane
ansible:
ansibleUser: cloud-admin
ansibleUser: root
ansiblePort: 22
ansibleVars:
service_net_map:
Copy link
Collaborator

Choose a reason for hiding this comment

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

not used anywhere. can be dropped.

@@ -87,32 +50,11 @@ spec:
# Default nic config template for a EDPM compute node
# These vars are edpm_network_config role vars
edpm_network_config_hide_sensitive_logs: false
edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
Copy link
Collaborator

Choose a reason for hiding this comment

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

this is the default. drop it?

Copy link
Contributor

Choose a reason for hiding this comment

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

Now that we have merged the new CRD design, I'll keep pushing forward with my other PR to change how this interface works anyway.
#394

managementNetwork: ctlplane
ansible:
ansibleUser: cloud-admin
ansibleUser: root
Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably decide what we actually want here. With tripleo, we went through the stages of heat-admin and tripleo-admin. I guess we want to standardise on something similar here? But probably not root right?

Understand the install_yamls situation. Just saying that we probably want to aim for a non-root user before we GA.

@@ -87,32 +50,11 @@ spec:
# Default nic config template for a EDPM compute node
# These vars are edpm_network_config role vars
edpm_network_config_hide_sensitive_logs: false
edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
Copy link
Contributor

Choose a reason for hiding this comment

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

Now that we have merged the new CRD design, I'll keep pushing forward with my other PR to change how this interface works anyway.
#394

edpm_ovn_dbs:
- 192.168.111.1
- 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

@fao89 fao89 force-pushed the upsamples branch 2 times, most recently from 9d8e8df to 3c53bd9 Compare September 11, 2023 17:44
@softwarefactory-project-zuul
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/2dbd0b61aad94b6992e632a4d35fe8d8

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 46m 41s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 49m 20s
dataplane-operator-crc-podified-edpm-baremetal FAILURE in 1h 27m 43s

- remove the symlinks
- update IPAM sample

Signed-off-by: Fabricio Aguiar <[email protected]>
@slagle
Copy link
Collaborator

slagle commented Sep 12, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 12, 2023
@openshift-merge-robot openshift-merge-robot merged commit 34ddd2a into openstack-k8s-operators:main Sep 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants