Skip to content

Commit 7cdfc5f

Browse files
committed
Add openstack_init target
This is to prepare for the new OpenStack initialization resource which installs CRDs, Rbac, and operators Jira: OSPRH-11298
1 parent e043121 commit 7cdfc5f

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,10 +732,18 @@ openstack_wait: openstack ## waits openstack CSV to succeed.
732732
$(eval $(call vars,$@,openstack))
733733
timeout $(TIMEOUT) bash -c 'until $$(oc get csv -l operators.coreos.com/openstack-operator.openstack-operators -n ${OPERATOR_NAMESPACE} | grep -q Succeeded); do sleep 1; done'
734734

735+
736+
# creates the new initialization resource for our operators
737+
.PHONY: openstack_init
738+
openstack_init: openstack_wait openstack_deploy_cleanup openstack_repo
739+
oc create -f ${OPERATOR_BASE_DIR}/openstack-operator/config/samples/operator_v1beta1_openstack.yaml
740+
oc wait openstack/openstack -n ${OPERATOR_NAMESPACE} --for condition=Ready --timeout=${TIMEOUT}
741+
735742
.PHONY: openstack_cleanup
736743
openstack_cleanup: operator_namespace## deletes the operator, but does not cleanup the service resources
737744
$(eval $(call vars,$@,openstack))
738745
${CLEANUP_DIR_CMD} ${OPERATOR_DIR}
746+
if oc get openstack &>/dev/null; then oc delete --ignore-not-found=true openstack/openstack; fi
739747
oc delete subscription --all=true
740748
oc delete csv --all=true
741749
oc delete catalogsource --all=true

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,11 @@ install using the redhat-marketplace
9999
REDHAT_OPERATORS=true make openstack
100100
```
101101

102+
* create the initialization resource (this deploys the operators)
103+
```bash
104+
make openstack_init
105+
```
106+
102107
**Note** this will also run the openstack_prep target, which if NETWORK_ISOLATION == true will install nmstate and metallb operator, configure the secondary interface of the crc VM via nncp, creates the network-attachment-definitions for datacentre, internalapi, storage and tenant network. Also the metallb l2advertisement and the ipaddresspools get created.
103108

104109
The following NADs with ip ranges get configured:

0 commit comments

Comments
 (0)