Skip to content

Commit

Permalink
fix(contrib): deis#859 remove update manager stop commands from Vagra…
Browse files Browse the repository at this point in the history
…ntfile
  • Loading branch information
Demian Ginther authored and carmstrong committed May 2, 2014
1 parent 65f8eff commit 9502968
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ Vagrant.configure("2") do |config|
# Enable NFS for sharing the host machine into the coreos-vagrant VM.
config.vm.synced_folder ".", "/home/core/share", id: "core", :nfs => true, :mount_options => ['nolock,vers=3,udp']

# disable update-engine to prevent reboots
config.vm.provision :shell, :inline => "systemctl stop update-engine-reboot-manager && systemctl disable update-engine-reboot-manager && systemctl mask update-engine-reboot-manager", :privileged => true
config.vm.provision :shell, :inline => "systemctl stop update-engine && systemctl disable update-engine && systemctl mask update-engine", :privileged => true

# user-data bootstrapping
config.vm.provision :file, :source => "contrib/coreos/user-data", :destination => "/tmp/vagrantfile-user-data"
config.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
Expand Down
20 changes: 20 additions & 0 deletions contrib/coreos/user-data
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,23 @@ coreos:
[Service]
Environment=FLEET_PUBLIC_IP=$public_ipv4
ExecStart=/usr/bin/fleet
- name: stop-reboot-manager.service
command: start
content: |
[Unit]
Description=stop update-engine-reboot-manager

[Service]
Type=oneshot
ExecStart=/usr/bin/systemctl stop update-engine-reboot-manager.service
ExecStartPost=/usr/bin/systemctl mask update-engine-reboot-manager.service
- name: stop-reboot-manager.service
command: start
content: |
[Unit]
Description=stop update-engine

[Service]
Type=oneshot
ExecStart=/usr/bin/systemctl stop update-engine.service
ExecStartPost=/usr/bin/systemctl mask update-engine.service

0 comments on commit 9502968

Please sign in to comment.