diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-26 17:38:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-26 17:38:26 -0800 |
commit | 65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8 (patch) | |
tree | 03ce2701a4550fb4a996fc4edfae94c363fdc271 /files/origin-components/console-config.yaml | |
parent | ef8e18254cd96b7b68a5e01ee0b2ae6b3a10d3c6 (diff) | |
parent | 7dceb6260a333e29c922dad8613ae6a0946fa07b (diff) | |
download | openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.tar.gz openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.tar.bz2 openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.tar.xz openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.zip |
Merge pull request #6840 from yocum137/rm_origin-components
Automatic merge from submit-queue.
moving files to their correct <role>/files location
The openshift_web_console and template_service_broker roles are putting 'files' outside the openshift-ansible roles they belong to.
Diffstat (limited to 'files/origin-components/console-config.yaml')
-rw-r--r-- | files/origin-components/console-config.yaml | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/files/origin-components/console-config.yaml b/files/origin-components/console-config.yaml deleted file mode 100644 index 55c650fbe..000000000 --- a/files/origin-components/console-config.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: webconsole.config.openshift.io/v1 -kind: WebConsoleConfiguration -clusterInfo: - consolePublicURL: https://127.0.0.1:8443/console/ - loggingPublicURL: "" - logoutPublicURL: "" - masterPublicURL: https://127.0.0.1:8443 - metricsPublicURL: "" -extensions: - scriptURLs: [] - stylesheetURLs: [] - properties: null -features: - inactivityTimeoutMinutes: 0 - clusterResourceOverridesEnabled: false -servingInfo: - bindAddress: 0.0.0.0:8443 - bindNetwork: tcp4 - certFile: /var/serving-cert/tls.crt - clientCA: "" - keyFile: /var/serving-cert/tls.key - maxRequestsInFlight: 0 - namedCertificates: null - requestTimeoutSeconds: 0 |