Skip to content

Commit

Permalink
Merge pull request #230 from abellotti/dbus_api_service
Browse files Browse the repository at this point in the history
Renaming auth_api to dbus_api service to reflect the new ManageIQ/dbus_api_service
  • Loading branch information
Fryguy authored Oct 5, 2017
2 parents 51bd083 + 650a4ec commit 6eb9bca
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions templates/miq-template-ext-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -466,13 +466,13 @@ objects:
- apiVersion: v1
kind: Service
metadata:
name: "${HTTPD_AUTH_API_SERVICE_NAME}"
name: "${HTTPD_DBUS_API_SERVICE_NAME}"
annotations:
description: Exposes the httpd server authentication api
description: Exposes the httpd server dbus api
service.alpha.openshift.io/dependencies: '[{"name":"${NAME}","namespace":"","kind":"Service"}]'
spec:
ports:
- name: http-auth-api
- name: http-dbus-api
port: 8080
targetPort: 8080
selector:
Expand Down Expand Up @@ -743,11 +743,11 @@ parameters:
displayName: Apache httpd Service Name
description: The name of the OpenShift Service exposed for the httpd container.
value: httpd
- name: HTTPD_AUTH_API_SERVICE_NAME
- name: HTTPD_DBUS_API_SERVICE_NAME
required: true
displayName: Apache httpd Authentication API Service Name
description: The name of httpd authentication api service.
value: httpd-auth-api
displayName: Apache httpd DBus API Service Name
description: The name of httpd dbus api service.
value: httpd-dbus-api
- name: HTTPD_IMG_NAME
displayName: Apache httpd Image Name
description: This is the httpd image name requested to deploy.
Expand Down
14 changes: 7 additions & 7 deletions templates/miq-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -613,13 +613,13 @@ objects:
- apiVersion: v1
kind: Service
metadata:
name: "${HTTPD_AUTH_API_SERVICE_NAME}"
name: "${HTTPD_DBUS_API_SERVICE_NAME}"
annotations:
description: Exposes the httpd server authentication api
description: Exposes the httpd server dbus api
service.alpha.openshift.io/dependencies: '[{"name":"${NAME}","namespace":"","kind":"Service"}]'
spec:
ports:
- name: http-auth-api
- name: http-dbus-api
port: 8080
targetPort: 8080
selector:
Expand Down Expand Up @@ -920,11 +920,11 @@ parameters:
displayName: Apache httpd Service Name
description: The name of the OpenShift Service exposed for the httpd container.
value: httpd
- name: HTTPD_AUTH_API_SERVICE_NAME
- name: HTTPD_DBUS_API_SERVICE_NAME
required: true
displayName: Apache httpd Authentication API Service Name
description: The name of httpd authentication api service.
value: httpd-auth-api
displayName: Apache httpd DBus API Service Name
description: The name of httpd dbus api service.
value: httpd-dbus-api
- name: HTTPD_IMG_NAME
displayName: Apache httpd Image Name
description: This is the httpd image name requested to deploy.
Expand Down

0 comments on commit 6eb9bca

Please # to comment.