Merge "Update containerd version"
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index d85aea1..74c5f41 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -68,7 +68,7 @@
# Repo-component versions (if applicable)
salt_version: 2017.7 # TODO should be deprecated variable after 2018.q4
linux_system_repo_mcp_cassandra_version: '21x'
- linux_system_repo_mcp_glusterfs_version_number: "5"
+ linux_system_repo_mcp_glusterfs_version_number: "3.8"
linux_system_repo_mcp_saltstack_version_number: "${_param:salt_version}"
linux_system_repo_mcp_ceph_codename: luminous
linux_repo_contrail_component: oc40
diff --git a/kubernetes/control/services/drivetrain/ldap.yml b/kubernetes/control/services/drivetrain/ldap.yml
index 35a361d..5a7c317 100644
--- a/kubernetes/control/services/drivetrain/ldap.yml
+++ b/kubernetes/control/services/drivetrain/ldap.yml
@@ -15,10 +15,8 @@
value: nginx
- name: nginx.ingress.kubernetes.io/ssl-redirect
value: false
- - name: nginx.ingress.kubernetes.io/add-base-url
- value: false
- name: nginx.ingress.kubernetes.io/rewrite-target
- value: /
+ value: /ldap
apiVersion: extensions/v1beta1
cluster: drivetrain
enabled: true
@@ -91,6 +89,8 @@
value: ${_param:admin_email}
- name: PHPLDAPADMIN_THEME
value: mirantis
+ - name: PHPLDAPADMIN_SERVER_PATH
+ value: "/ldap"
ports:
- port: 80
name: admin