Skip to content

Commit

Permalink
fix routes
Browse files Browse the repository at this point in the history
  • Loading branch information
Gl4di4torRr committed Apr 8, 2019
1 parent 206d494 commit 2b8c31b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
9 changes: 4 additions & 5 deletions basic-nginx/.applier/group_vars/seed-hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ openshift_cluster_content:
- name: jenkins
namespace: basic-nginx-build
template: openshift//jenkins-ephemeral
params: "{{ inventory_dir }}/../.openshift/deployment/build/params"
params_from_vars:
SOURCE_REPOSITORY_URL: "{{ source_code_url }}"
SOURCE_REPOSITORY_REF: "{{ source_code_ref }}"
- name: basic-nginx-dev
template: "{{ inventory_dir }}/../.openshift/deployment/template.yml"
params: "{{ inventory_dir }}/../.openshift/deployment/dev/params"
Expand All @@ -29,4 +25,7 @@ openshift_cluster_content:
content:
- name: jenkins
template: "{{ inventory_dir }}/../.openshift/builds/template.yml"
params: "{{ inventory_dir }}/../.openshift/builds/params"
params: "{{ inventory_dir }}/../.openshift/builds/params"
params_from_vars:
SOURCE_REPOSITORY_URL: "{{ source_code_url }}"
SOURCE_REPOSITORY_REF: "{{ source_code_ref }}"
2 changes: 0 additions & 2 deletions basic-nginx/.openshift/builds/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@ parameters:
- description: Git source URI for application
name: SOURCE_REPOSITORY_URL
required: true
value: https://github.com/redhat-copcontainer-pipelines.git
- description: Git branch/tag reference
name: SOURCE_REPOSITORY_REF
value: "master"
- description: Path within Git project to build; empty for root project directory.
name: CONTEXT_DIR
value: "basic-nginx"
Expand Down
1 change: 1 addition & 0 deletions basic-nginx/.openshift/deployment/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ objects:
host: ${HOSTNAME_HTTP}
to:
name: ${APPLICATION_NAME}
- apiVersion: v1
kind: Service
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion basic-nginx/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
- name: openshift-applier
scm: git
src: https://github.com/redhat-cop/openshift-applier
version: v2.0.8
version: v2.0.9

0 comments on commit 2b8c31b

Please sign in to comment.