From 9db4052423f34a76296ffdcda896cdeba2b4aead Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sat, 22 Jul 2017 17:10:02 +0300 Subject: [sdc] 1710 rebase code Change-Id: Icedeac71c0a9d27518969effcd5d5519de9955a6 Signed-off-by: Michael Lando --- sdc-os-chef/sdc-backend/Dockerfile | 1 + .../sdc-catalog-fe/templates/default/FE-configuration.yaml.erb | 8 +++++++- sdc-os-chef/sdc-sanity/Dockerfile | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'sdc-os-chef') diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile index 3a39d257e3..6eaac4a5d1 100644 --- a/sdc-os-chef/sdc-backend/Dockerfile +++ b/sdc-os-chef/sdc-backend/Dockerfile @@ -9,6 +9,7 @@ ENV HTTPS_PROXY ${HTTPS_PROXY} RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi + RUN apt-get -y update RUN apt-get -y install apt-utils RUN apt-get -y install curl diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb index f864bb9dbb..c6fc36cb55 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb @@ -26,6 +26,12 @@ healthCheckSocketTimeoutInMs: 5000 healthCheckIntervalInSeconds: 5 +onboarding: + protocol: http + host: localhost + port: 8181 + healthCheckUri: "/onboarding/v1.0/healthcheck" + identificationHeaderFields: - - &HTTP_IV_USER HTTP_IV_USER @@ -70,7 +76,7 @@ protocols: systemMonitoring: - enabled: true + enabled: false isProxy: true probeIntervalInSeconds: 15 diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile index c5421a117c..9dd829158f 100644 --- a/sdc-os-chef/sdc-sanity/Dockerfile +++ b/sdc-os-chef/sdc-sanity/Dockerfile @@ -24,5 +24,4 @@ RUN curl -L https://omnitruck.chef.io/install.sh | bash COPY startup.sh /root/ RUN chmod 770 /root/startup.sh - ENTRYPOINT [ "/root/startup.sh" ] -- cgit 1.2.3-korg