Skip to content

Commit 1e377f9

Browse files
abaysfultonj
authored andcommitted
Support new OpenStack initialization resource for RHOSO install
1 parent 6af6dd2 commit 1e377f9

File tree

4 files changed

+39
-7
lines changed

4 files changed

+39
-7
lines changed

examples/common/README.md

+24-7
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
All VAs and DTs assume that these CRs have been created.
44

55
## OLM
6-
76
The [olm](olm) directory contains a kustomization which will generate
87
Namespace, OperatorGroup, and Subscription CRs. Creating these CRs
9-
will install the OpenStack K8S operators and their dependencies.
8+
will install the base OpenStack K8s operator.
109

1110
Observe CRs which will be generated.
1211
```
@@ -16,14 +15,12 @@ Create the CRs.
1615
```
1716
oc apply -k examples/common/olm/
1817
```
19-
Watch the OpenStack operator pods start.
20-
```
21-
oc get pods -w -n openstack-operators
22-
```
2318
The following commands can be used to confirm that each step of this
2419
procedure is complete.
2520
```
26-
while ! (oc get pod --no-headers=true -l name=cert-manager-operator -n cert-manager-operator| grep "cert-manager-operator"); do sleep 10; done
21+
while ! (oc get pod --no-headers=true -l openstack.org/operator-name=openstack-controller -n openstack-operators | grep "controller-operator"); do sleep 10; done
22+
oc wait pod -n openstack-operators --for condition=Ready -l openstack.org/operator-name=openstack-controller --timeout=300s
23+
while ! (oc get pod --no-headers=true -l name=cert-manager-operator -n cert-manager-operator | grep "cert-manager-operator"); do sleep 10; done
2724
oc wait pod -n cert-manager-operator --for condition=Ready -l name=cert-manager-operator --timeout=300s
2825
while ! (oc get pod --no-headers=true -l app=cainjector -n cert-manager | grep "cert-manager-cainjector"); do sleep 10; done
2926
oc wait pod -n cert-manager -l app=cainjector --for condition=Ready --timeout=300s
@@ -76,3 +73,23 @@ oc wait pod -n openshift-nmstate -l component=kubernetes-nmstate-handler --for c
7673
timeout 300 bash -c "while ! (oc get deployments/nmstate-webhook -n openshift-nmstate); do sleep 10; done"
7774
oc wait deployments/nmstate-webhook -n openshift-nmstate --for condition=Available --timeout=300s
7875
```
76+
77+
# OpenStack
78+
79+
The [openstack](openstack) directory contains a kustomization which will generate
80+
the `OpenStack` initialization CR. Creating this CR will install the remaining
81+
OpenStack K8s operators.
82+
83+
Observe CRs which will be generated.
84+
```
85+
kustomize build examples/common/openstack/
86+
```
87+
Create the CRs.
88+
```
89+
oc apply -k examples/common/openstack/
90+
```
91+
The following command can be used to confirm that each step of this
92+
procedure is complete.
93+
```
94+
oc wait -n openstack-operators openstack openstack --for condition=Ready --timeout=300s
95+
```
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
components:
3+
- ../../../lib/openstack

lib/openstack/kustomization.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1alpha1
3+
kind: Component
4+
5+
resources:
6+
- openstack_deploy.yaml

lib/openstack/openstack_deploy.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
apiVersion: operator.openstack.org/v1beta1
3+
kind: OpenStack
4+
metadata:
5+
name: openstack
6+
namespace: openstack-operators

0 commit comments

Comments
 (0)