Merge pull request #47 from jacobsee/dev-deploy-cleanup

General cleanup

Author: jacobsee

.applier/apply.yml

@@ -138,10 +138,10 @@ oc apply -f infinispan-cluster.yaml
 ```
 
 ## Configuration
+
 The preferred place to store non-sensitive data is in the application.properties.
 
 Sensitive fields like the gitlab token and cluster credentials should be stored in a OpenShift secret at a minimum. Other environment specific information should be stored in environmental variables such as repository id for residencies and repository id for the config.
-This info is stored in `ocp-s11/labs-test/omp-gitlab-configuration`.
 
 Deployment template will read from the above secret and inject following env variables. These are controlled from application.properties, so if a different env name is needed, change in the application properties file and the deployment template.
 
@@ -153,15 +153,3 @@ Deployment template will read from the above secret and inject following env var
 * `CACHE_USER`
 * `CACHE_PASS` (should be secret and match the Infinispan operator secret)
 * `CACHE_USE_AUTH` set to true
-
-### OpenShift Applier
-
-This section is not guaranteed to be up to date. This project includes an `openshift-applier` inventory. To use it, make sure that you are logged in to the cluster and that you customize the variables in `.applier/inventory/group_vars/all.yml` - namely make sure that `deploy_vars` uses the correct endpoints. Once these are configured, you can deploy the project with:
-
-```bash
-cd .applier/
-ansible-galaxy install -r requirements.yml --roles-path=roles --force
-ansible-playbook apply.yml -i inventory/
-```
-
-

.applier/inventory/group_vars/all.yml

@@ -18,16 +18,17 @@ If you are not familiar with Helm - how to configure it and run - you can start
 git clone https://github.com/rht-labs/open-management-portal-git-api
 ```
 
-2. Change into to the `development` directory:
+2. Change into to the `deployment` directory:
 
 ```
-cd open-management-portal-git-api/development
+cd open-management-portal-git-api/deployment
 ```
 
 3. Deploy using the following Helm command:
 
 ```shell script
 helm template . \
+  --values values-dev.yaml \
   --set git.uri=https://github.com/rht-labs/open-management-portal-git-api.git \
   --set git.ref=master \
   --set cacheService=<your-infinispan-service-name> \

.applier/inventory/host_vars/localhost.yml

@@ -1,3 +1,4 @@
+{{- if .Values.development }}
 apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
@@ -27,4 +28,5 @@ spec:
     type: Source
   successfulBuildsHistoryLimit: 5
   triggers:
-    - type: ConfigChange
+    - type: ConfigChange
+{{- end }}