Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

fix dcos 1.11 template for preprovision extension #2873

Merged
merged 1 commit into from
May 7, 2018
Merged

fix dcos 1.11 template for preprovision extension #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion parts/dcos/bstrap/bootstrapcustomdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mounts:
- /var/lib/mesos
- - ephemeral0.2
- /var/lib/docker
runcmd: PREPROVISION_EXTENSION
runcmd:
- [ ln, -s, /bin/rm, /usr/bin/rm ]
- [ ln, -s, /bin/mkdir, /usr/bin/mkdir ]
- [ ln, -s, /bin/tar, /usr/bin/tar ]
Expand Down
38 changes: 18 additions & 20 deletions parts/dcos/bstrap/dcoscustomdata111.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#cloud-config

bootcmd:
- bash -c "if [ ! -f /var/lib/sdb-gpt ];then echo DCOS-5890;parted -s /dev/sdb mklabel
gpt;touch /var/lib/sdb-gpt;fi"
Expand All @@ -23,24 +21,24 @@ mounts:
- - ephemeral0.2
- /var/lib/docker
runcmd: PREPROVISION_EXTENSION
- [ ln, -s, /bin/rm, /usr/bin/rm ]
- [ ln, -s, /bin/mkdir, /usr/bin/mkdir ]
- [ ln, -s, /bin/tar, /usr/bin/tar ]
- [ ln, -s, /bin/ln, /usr/bin/ln ]
- [ ln, -s, /bin/cp, /usr/bin/cp ]
- [ ln, -s, /bin/systemctl, /usr/bin/systemctl ]
- [ ln, -s, /bin/mount, /usr/bin/mount ]
- [ ln, -s, /bin/bash, /usr/bin/bash ]
- [ ln, -s, /usr/sbin/useradd, /usr/bin/useradd ]
- [ systemctl, disable, --now, resolvconf.service ]
- [ systemctl, mask, --now, lxc-net.service ]
- [ systemctl, disable, --now, unscd.service ]
- [ systemctl, stop, --now, unscd.service ]
- /opt/azure/containers/provision.sh
- [ systemctl, start, dcos-docker-install.service ]
- [ systemctl, restart, systemd-journald.service ]
- [ bash, /tmp/dcos/dcos_install.sh, ROLENAME ]
- [ bash, /opt/azure/dcos/diagnostics_fix.sh ]
- ln -s /bin/rm /usr/bin/rm
- ln -s /bin/mkdir /usr/bin/mkdir
- ln -s /bin/tar /usr/bin/tar
- ln -s /bin/ln /usr/bin/ln
- ln -s /bin/cp /usr/bin/cp
- ln -s /bin/systemctl /usr/bin/systemctl
- ln -s /bin/mount /usr/bin/mount
- ln -s /bin/bash /usr/bin/bash
- ln -s /usr/sbin/useradd /usr/bin/useradd
- systemctl disable --now resolvconf.service
- systemctl mask --now lxc-net.service
- systemctl disable --now unscd.service
- systemctl stop --now unscd.service
- /opt/azure/containers/provision.sh
- systemctl start dcos-docker-install.service
- systemctl restart systemd-journald.service
- bash /tmp/dcos/dcos_install.sh ROLENAME
- bash /opt/azure/dcos/diagnostics_fix.sh
write_files:
- content: |
[Unit]
Expand Down
2 changes: 0 additions & 2 deletions pkg/acsengine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,6 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
},
"GetDCOSBootstrapCustomData": func() string {
bootstrapProvisionScript := getDCOSBootstrapProvisionScript()
bootstrapPreprovisionExtension := ""
masterIPList := generateIPList(cs.Properties.MasterProfile.Count, cs.Properties.MasterProfile.FirstConsecutiveStaticIP)
for i, v := range masterIPList {
masterIPList[i] = " - " + v
Expand All @@ -1164,7 +1163,6 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
strings.Replace(bootstrapProvisionScript, "\r\n", "\n", -1),
"\n", "\n\n ", -1),
"MASTER_IP_LIST": strings.Join(masterIPList, "\n"),
"PREPROVISION_EXTENSION": bootstrapPreprovisionExtension,
"BOOTSTRAP_IP": bootstrapIP,
"BOOTSTRAP_OAUTH_ENABLED": strconv.FormatBool(cs.Properties.OrchestratorProfile.DcosConfig.BootstrapProfile.OAuthEnabled)})

Expand Down