Skip to content

Commit

Permalink
chore: migrate nodes to live in baremetal project
Browse files Browse the repository at this point in the history
Move the project that our servers live in and get controlled in do a new
domain called 'infra' with a project called 'baremetal'
  • Loading branch information
cardoe committed Sep 23, 2024
1 parent 66f18ea commit 6aaf343
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
26 changes: 13 additions & 13 deletions components/keystone/aio-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ bootstrap:
--user="${OS_USERNAME}" \
--domain="${OS_DEFAULT_DOMAIN}" \
"admin"
# create 'argoworkflow' user
# credentials for ironic-nautobot-sync and other argo workflows
openstack project create undercloud --or-show
openstack user create --project undercloud --password demo argoworkflow --or-show
openstack role add --user argoworkflow --project undercloud member
openstack role add --user argoworkflow --project undercloud admin
# allow ironic user to see servers in undercloud project
openstack role add --project undercloud --user ironic --user-domain service member
# create 'infra' domain
openstack domain create --or-show infra
# create 'baremetal' project for our ironic nodes to live in
openstack project create --or-show --domain infra baremetal
# create 'argoworkflow' user for automation
openstack user create --or-show --domain infra --password demo argoworkflow
# give 'argoworkflow' 'admin' over the 'baremetal' project
openstack role add --user-domain infra --project-domain infra --user argoworkflow --project baremetal admin
# this is too early because ironic won't exist
openstack role add --project service --user ironic --user-domain service service
# add 'demo' user to have 'member' role, needed for horizon dashboard use
openstack role add --user demo --project undercloud member
# OIDC integration
RULES_FILE=$(mktemp)
Expand Down Expand Up @@ -82,14 +82,14 @@ bootstrap:
openstack role add --group ${group} --domain default member
done
openstack role add --group ucadmin --domain default admin
openstack role add --group ucadmin --project undercloud admin
openstack role add --group ucadmin --domain infra admin
# TODO: only create this actually requested
# create 'demo' user with sufficient permissions
openstack user create --or-show --password demo --email '[email protected]' demo
openstack user set --email '[email protected]' demo
# add 'demo' user to 'ucadmin' group
openstack group add user ucadmin demo
# add 'demo' user to 'ucuser' group
openstack group add user ucuser demo
network:
# configure OpenStack Helm to use Undercloud's ingress
Expand Down
5 changes: 5 additions & 0 deletions components/nova/aio-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ conf:
# config_drive to pass data. To avoid users having to remember this, just
# force it on always.
force_config_drive: true
nova_ironic:
ironic:
# this is where we populate our hardware
project_domain_name: infra
project_name: baremetal


console:
Expand Down
3 changes: 1 addition & 2 deletions components/openstack/svc-acct-argoworkflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ spec:
# this provider needs to go away for a generated account
# but it currently must be in sync with the keystone bootstrap
# script
# this should be the 'service' domain in the future
user_domain: default
user_domain: infra
username: argoworkflow
password: demo
---
Expand Down
6 changes: 2 additions & 4 deletions workflows/argo-events/secrets/openstack-svc-acct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ spec:
user_domain_name: {{ .user_domain }}
username: {{ .username }}
password: {{ .password }}
# this should switch to where we will be creating the ironic nodes
# in the future
project_domain_name: default
project_name: undercloud
project_domain_name: infra
project_name: baremetal
dataFrom:
- extract:
key: svc-acct-argoworkflow
Expand Down

0 comments on commit 6aaf343

Please sign in to comment.