mirror of https://github.com/apache/cloudstack.git
cks: Fix missing .service files when bootstraping in cks (#6076)
* cks: Run 'systemctl daemon-reload' before setting up k8s * add wait till service files exists
This commit is contained in:
parent
f84d63dd0e
commit
704a939c65
|
|
@ -220,15 +220,15 @@ write_files:
|
|||
owner: root:root
|
||||
content: |
|
||||
#!/bin/bash -e
|
||||
|
||||
|
||||
export registryConfig="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"{{registry.url.endpoint}}\"]\n \\ endpoint = [\"{{registry.url}}\"]"
|
||||
export registryCredentials="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.configs.\"{{registry.url.endpoint}}\".auth]\n\tusername = \"{{registry.username}}\" \n\tpassword = \"{{registry.password}}\" \n\tidentitytoken = \"{{registry.token}}\""
|
||||
|
||||
|
||||
echo "creating config file for containerd"
|
||||
containerd config default > /etc/containerd/config.toml
|
||||
sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry\]/a '"${registryCredentials}"'' /etc/containerd/config.toml
|
||||
sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry.mirrors\]/a '"${registryConfig}"'' /etc/containerd/config.toml
|
||||
|
||||
|
||||
echo "Restarting containerd service"
|
||||
systemctl restart containerd
|
||||
|
||||
|
|
@ -263,7 +263,10 @@ runcmd:
|
|||
- chown -R cloud:cloud /home/cloud/.ssh
|
||||
- containerd config default > /etc/containerd/config.toml
|
||||
- sed -i '/\[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options\]/a '"\\ SystemdCgroup=true"'' /etc/containerd/config.toml
|
||||
- systemctl daemon-reload
|
||||
- systemctl restart containerd
|
||||
- until [ -f /etc/systemd/system/deploy-kube-system.service ]; do sleep 5; done
|
||||
- until [ -f /etc/systemd/system/setup-kube-system.service ]; do sleep 5; done
|
||||
- [ systemctl, start, setup-kube-system ]
|
||||
- [ systemctl, start, deploy-kube-system ]
|
||||
|
||||
|
|
|
|||
|
|
@ -277,15 +277,15 @@ write_files:
|
|||
owner: root:root
|
||||
content: |
|
||||
#!/bin/bash -e
|
||||
|
||||
|
||||
export registryConfig="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"{{registry.url.endpoint}}\"]\n \\ endpoint = [\"{{registry.url}}\"]"
|
||||
export registryCredentials="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.configs.\"{{registry.url.endpoint}}\".auth]\n\tusername = \"{{registry.username}}\" \n\tpassword = \"{{registry.password}}\" \n\tidentitytoken = \"{{registry.token}}\""
|
||||
|
||||
|
||||
echo "creating config file for containerd"
|
||||
containerd config default > /etc/containerd/config.toml
|
||||
sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry\]/a '"${registryCredentials}"'' /etc/containerd/config.toml
|
||||
sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry.mirrors\]/a '"${registryConfig}"'' /etc/containerd/config.toml
|
||||
|
||||
|
||||
echo "Restarting containerd service"
|
||||
systemctl restart containerd
|
||||
|
||||
|
|
@ -321,7 +321,10 @@ runcmd:
|
|||
- chown -R cloud:cloud /home/cloud/.ssh
|
||||
- containerd config default > /etc/containerd/config.toml
|
||||
- sed -i '/\[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options\]/a '"\\ SystemdCgroup=true"'' /etc/containerd/config.toml
|
||||
- systemctl daemon-reload
|
||||
- systemctl restart containerd
|
||||
- until [ -f /etc/systemd/system/deploy-kube-system.service ]; do sleep 5; done
|
||||
- until [ -f /etc/systemd/system/setup-kube-system.service ]; do sleep 5; done
|
||||
- [ systemctl, start, setup-kube-system ]
|
||||
- [ systemctl, start, deploy-kube-system ]
|
||||
|
||||
|
|
|
|||
|
|
@ -220,15 +220,15 @@ write_files:
|
|||
owner: root:root
|
||||
content: |
|
||||
#!/bin/bash -e
|
||||
|
||||
|
||||
export registryConfig="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"{{registry.url.endpoint}}\"]\n \\ endpoint = [\"{{registry.url}}\"]"
|
||||
export registryCredentials="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.configs.\"{{registry.url.endpoint}}\".auth]\n\tusername = \"{{registry.username}}\" \n\tpassword = \"{{registry.password}}\" \n\tidentitytoken = \"{{registry.token}}\""
|
||||
|
||||
|
||||
echo "creating config file for containerd"
|
||||
containerd config default > /etc/containerd/config.toml
|
||||
sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry\]/a '"${registryCredentials}"'' /etc/containerd/config.toml
|
||||
sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry.mirrors\]/a '"${registryConfig}"'' /etc/containerd/config.toml
|
||||
|
||||
|
||||
echo "Restarting containerd service"
|
||||
systemctl restart containerd
|
||||
|
||||
|
|
@ -263,6 +263,9 @@ runcmd:
|
|||
- chown -R cloud:cloud /home/cloud/.ssh
|
||||
- containerd config default > /etc/containerd/config.toml
|
||||
- sed -i '/\[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options\]/a '"\\ SystemdCgroup=true"'' /etc/containerd/config.toml
|
||||
- systemctl daemon-reload
|
||||
- systemctl restart containerd
|
||||
- until [ -f /etc/systemd/system/deploy-kube-system.service ]; do sleep 5; done
|
||||
- until [ -f /etc/systemd/system/setup-kube-system.service ]; do sleep 5; done
|
||||
- [ systemctl, start, setup-kube-system ]
|
||||
- [ systemctl, start, deploy-kube-system ]
|
||||
|
|
|
|||
Loading…
Reference in New Issue