| commit | 9db4052423f34a76296ffdcda896cdeba2b4aead | [log] [tgz] |
|---|---|---|
| author | Michael Lando <ml636r@att.com> | Sat Jul 22 17:10:02 2017 +0300 |
| committer | Michael Lando <ml636r@att.com> | Sat Jul 22 17:10:02 2017 +0300 |
| tree | 7c3b779c6d09be40283158382dee2cf02767761e | |
| parent | 3c3c833897dbfc0e85feaf36086a505f990ecb76 [diff] |
[sdc] 1710 rebase code Change-Id: Icedeac71c0a9d27518969effcd5d5519de9955a6 Signed-off-by: Michael Lando <ml636r@att.com>
diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile index 3a39d25..6eaac4a 100644 --- a/sdc-os-chef/sdc-backend/Dockerfile +++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -9,6 +9,7 @@ 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 f864bb9..c6fc36c 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 @@ 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 @@ 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 c5421a1..9dd8291 100644 --- a/sdc-os-chef/sdc-sanity/Dockerfile +++ b/sdc-os-chef/sdc-sanity/Dockerfile
@@ -24,5 +24,4 @@ COPY startup.sh /root/ RUN chmod 770 /root/startup.sh - ENTRYPOINT [ "/root/startup.sh" ]