Skip to content

Commit 288db13

Browse files
committed
Rejig the repository layout
1 parent cd3ab6c commit 288db13

29 files changed

Lines changed: 31 additions & 10 deletions

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Repository to demo installation of Red Hat OpenStack Services on OpenShift
1111
* `applications/`
1212
* contains the base Applications to get the OpenStack
1313
Operators running
14-
* `overlays/`
14+
* `environments/`
1515
* contains the OpenStack deployment application that is managed by the
1616
Operators
1717

@@ -24,11 +24,11 @@ Expected order of operations is:
2424

2525
* configure your networking environment and document the interfaces for
2626
configuration of NNCP
27-
* deploy OpenShift GitOps to the environment from `orchestration/argocd`
27+
* deploy OpenShift GitOps to the environment from `orchestration/openshift-gitops`
2828
* deploy `applications/openstack-common`
29-
* copy and modify `overlays/stackops` into a new path and modify the
29+
* copy and modify `environments/stackops` into a new path and modify the
3030
openstack-nncp.yaml at the least
31-
* deploy `overlays/stackops`
31+
* deploy `environments/stackops`
3232

3333
**NOTE**: The deployment of `stackops` will require modification of the files to match
3434
the network configuration.
@@ -47,7 +47,7 @@ _Procedure_
4747

4848
* Deploy OpenStack:
4949
```
50-
$ oc create -k overlays/stackops/
50+
$ oc create -k applications/stackops/
5151
```
5252

5353
## Accessing the user interface for OpenShift GitOps
File renamed without changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- application-metallb.yaml
File renamed without changes.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- application-nmstate.yaml
6+
File renamed without changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- application-olm.yaml

applications/openstack-common/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ _Procedure_
66

77
* Create the _openstack-common_ Application in OpenShift GitOps:
88
```
9-
$ oc create -f application-openstack-common.yaml
9+
$ oc create -f .
1010
```

applications/openstack-common/application-openstack-common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
server: https://kubernetes.default.svc
99
project: default
1010
source:
11-
path: applications/openstack-common
11+
path: applications/openstack-common/common
1212
repoURL: https://github.com/leifmadsen/rhoso-gitops.git
1313
targetRevision: HEAD
1414
syncPolicy:
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
resources:
5+
- ../../base/metallb
6+
- ../../base/nmstate
7+
- ../../base/olm

0 commit comments

Comments
 (0)