diff options
| -rw-r--r-- | TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml | 25 | ||||
| -rw-r--r-- | TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml | 2 |
2 files changed, 22 insertions, 5 deletions
diff --git a/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml b/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml index 2a7b7e7bc4..e0aba3d961 100644 --- a/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml +++ b/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml @@ -34,6 +34,17 @@ node_templates: ssh-authorized-keys: - { get_secret: agent_key_public } write_files: + - path: /etc/yum.repos.d/docker.repo + owner: root:root + permissions: '0444' + content: | + # installed by cloud-init + [dockerrepo] + name=Docker Repository + baseurl=https://yum.dockerproject.org/repo/main/centos/7 + enabled=1 + gpgcheck=1 + gpgkey=https://yum.dockerproject.org/gpg - path: /etc/yum.repos.d/kubernetes.repo owner: root:root permissions: '0444' @@ -57,10 +68,10 @@ node_templates: net.bridge.bridge-nf-call-iptables = 1 packages: - - [docker, 1.12.6] - - [kubelet, 1.8.6-0] - - [kubeadm, 1.8.6-0] - - [kubectl, 1.8.6-0] + - [docker-engine, 17.03.0.ce-1.el7.centos] + - [kubelet, 1.8.10-0] + - [kubeadm, 1.8.10-0] + - [kubectl, 1.8.10-0] - [kubernetes-cni, 0.5.1-1] - [nfs-utils] - git @@ -68,10 +79,16 @@ node_templates: runcmd: - [ setenforce, 0 ] - [ sysctl , '--system' ] + - [ update-ca-trust, force-enable ] + - "sed -i 's|/usr/bin/dockerd|/usr/bin/dockerd --exec-opt native.cgroupdriver=systemd|g' /usr/lib/systemd/system/docker.service" - [ systemctl, enable, docker ] - [ systemctl, start, docker ] + - [ chmod, 655, /etc/systemd/system/kubelet.service ] + - [ chmod, 655, /etc/systemd/system/kubelet.service.d/10-kubeadm.conf ] - [ systemctl, enable, kubelet ] - [ systemctl, start, kubelet ] + - [ iptables, --flush ] + - [ iptables, -tnat, --flush ] - [ mkdir, '-p', /tmp/data ] - [ chcon, '-Rt', svirt_sandbox_file_t, /tmp/data ] - [ mkdir, '-p', /dockerdata-nfs ] diff --git a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml index 3219791c0d..8f5716fead 100644 --- a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml +++ b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml @@ -47,7 +47,7 @@ inputs: helm_version: description: helm version to be installed - default: v2.7.0 + default: v2.8.2 dsl_definitions: |