commit eb6d8cbf86e7d6435245905e7f707b9db18636c1
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Jan 25 08:51:02 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Jan 25 08:51:02 2019 +0000
tree 715608f1984becd666ec3b0cc9a349f9b20bfb59
parent fb3303d06518b9dd244f6770dfba3435407d832b
parent e3f3f7edede6a702c9e4d3e62558775b08091ecc

Merge "Install containerd.io along with docker-ce package"

keystone/client/service/radosgw-swift.yml

diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index e3f8157..cd495ee 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -31,12 +31,12 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: ${_param:radosgw_swift_cluster_port}
-                  public_path: '/swift/v1' # /$(project_id)s
+                  public_path: '/swift/v1/AUTH_%(tenant_id)s'
                   internal_address: ${_param:radosgw_service_host}
                   internal_port: ${_param:radosgw_swift_cluster_port}
-                  internal_path: '/swift/v1'
+                  internal_path: '/swift/v1/AUTH_%(tenant_id)s'
                   internal_protocol: ${_param:radosgw_service_protocol}
                   admin_protocol: ${_param:radosgw_service_protocol}
                   admin_address: ${_param:radosgw_service_host}
                   admin_port: ${_param:radosgw_swift_cluster_port}
-                  admin_path: '/swift/v1'
+                  admin_path: '/swift/v1/AUTH_%(tenant_id)s'

keystone/client/v3/service/radosgw-swift.yml

diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index b9fadc8..d1acce3 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -30,13 +30,13 @@
               endpoints:
                 radosgw-swift_public:
                   interface: 'public'
-                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}
                 radosgw-swift_internal:
                   interface: 'internal'
-                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}
                 radosgw-swift_admin:
                   interface: 'admin'
-                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}

kubernetes/common/init.yml

diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 0c69c9e..c9f83c8 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -24,6 +24,7 @@
     kubernetes_containerd_repo: https://github.com/kubernetes-sigs/cri-tools/releases/download
     kubernetes_openstack_provider_repo: ${_param:mcp_binary_registry}/mirantis/kubernetes/cloud-provider-openstack
     kubernetes_metrics_server_repo: k8s.gcr.io
+    kubernetes_helm_tiller_repo: gcr.io/kubernetes-helm
 
     # component images/binaries
     kubernetes_calico_image: ${_param:kubernetes_calico_repo}/node:v3.3.2
@@ -71,6 +72,7 @@
     kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.3.2
     kubernetes_containerd_package: containerd.io=1.2.1-1~u16.04+mcp
     kubernetes_metrics_server_image: ${_param:kubernetes_metrics_server_repo}/metrics-server-amd64:v0.3.1
+    kubernetes_helm_tiller_image: ${_param:kubernetes_helm_tiller_repo}/tiller:v2.12.2
 
     kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:mcp_version}
     kubernetes_opencontrail_analyticsdb_image: ${_param:kubernetes_contrail_registry}/opencontrail-analyticsdb:${_param:mcp_version}
@@ -95,6 +97,7 @@
     kubernetes_ingressnginx_enabled: false
     kubernetes_containerd_enabled: true
     kubernetes_metrics_server_enabled: false
+    kubernetes_helm_tiller_enabled: false
 
     kubernetes_ingressnginx_controller_replicas: 1
 
@@ -242,6 +245,9 @@
         metrics-server:
           enabled: ${_param:kubernetes_metrics_server_enabled}
           controller_image: ${_param:kubernetes_metrics_server_image}
+        helm:
+          enabled: ${_param:kubernetes_helm_tiller_enabled}
+          tiller_image: ${_param:kubernetes_helm_tiller_image}
     pool:
       enabled: false
       kubelet:

maas/region/single.yml

diff --git a/maas/region/single.yml b/maas/region/single.yml
index 309ef34..96ba7c6 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -53,6 +53,10 @@
         name: maasdb
         password: ${_param:maas_db_password}
         username: maas
+      ntp:
+        server_1:
+          enabled: true
+          host: pool.ntp.org
       maas_config:
         main_archive: ${_param:maas_region_main_archive}
         commissioning_distro_series: xenial