krates-plugin-vagrant 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb +3 -3
  3. data/lib/kontena/machine/vagrant/Vagrantfile.node.rb.erb +1 -0
  4. data/lib/kontena/machine/vagrant/cloudinit.yml +2 -3
  5. data/lib/kontena/plugin/vagrant.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bf3507b572e282860f321d68e73ecb5b2dfdfa426ff77f144b5bb75e3c901c9a
4
- data.tar.gz: 7c34b0db91643ee2f84d0fe7306fc83d620fb66cb2ae48c5fff05f1977a86541
3
+ metadata.gz: 79efa3e6c7ce350be9da245820ee60b39e8c06562e745a7046f97136fbd07e25
4
+ data.tar.gz: 7c7e208346925d7291094a0af7d3220b46d13a8a0af7d8c11ac0593790ca7968
5
5
  SHA512:
6
- metadata.gz: 036c1bb958cbd0059e30918044fc0ac2ccd450f7b08f2840c421ac4569a90be8b018562202cfff93499f554a41f453c20ab850c6927cb09cab4369750ca425f9
7
- data.tar.gz: c7688bcb7de0b408c0d08b80d8e327fcb845f36d7b5e6412637ba8a5df6963d19726cf57560f4f44f5682b62abc24aa2f2dd11969e9dd8a6c296e677d740afcb
6
+ metadata.gz: 159e0a10d8f8b86e33897204d0731237b218d5b4841982b651d7480877a6ac63d5516effb2d1f999d9e62c3d12b0a6b1236cde138518607d331518b0188856f8
7
+ data.tar.gz: e7aa538d3cc94693a5b4f1e8142768190b479f3b3ea404c76e6ec6ac67d6692e6ee1a63285b2f15e3f19375874acf3561bb315334c67ec065fb4d4126f97c0eb
data/lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb CHANGED
@@ -11,7 +11,6 @@ write_files:
11
11
  permissions: 0600
12
12
  owner: root
13
13
  content: |
14
- KONTENA_VERSION=<%= version %>
15
14
  KRATES_VAULT_KEY=<%= vault_secret %>
16
15
  KRATES_VAULT_IV=<%= vault_iv %>
17
16
  coreos:
@@ -69,7 +68,7 @@ coreos:
69
68
  ExecStartPre=-/usr/bin/docker stop krates-server-api
70
69
  ExecStartPre=-/usr/bin/docker rm krates-server-api
71
70
  ExecStartPre=-/usr/bin/docker network create krates
72
- ExecStartPre=/usr/bin/docker pull krates/master:${KONTENA_VERSION}
71
+ ExecStartPre=/usr/bin/docker pull quay.io/krates/master
73
72
  ExecStart=/usr/bin/docker run --name krates-server-api \
74
73
  -e MONGODB_URI=mongodb://krates-server-mongo:27017/krates_server \
75
74
  -e VAULT_KEY=${KRATES_VAULT_KEY} -e VAULT_IV=${KRATES_VAULT_IV} \
@@ -77,7 +76,7 @@ coreos:
77
76
  <% if initial_admin_code %>-e INITIAL_ADMIN_CODE=<%= initial_admin_code %><% end %> \
78
77
  --network krates \
79
78
  -p 8080:9292 \
80
- krates/master:${KONTENA_VERSION}
79
+ quay.io/krates/master
81
80
  ExecStop=/usr/bin/docker stop krates-server-api
82
81
  INIT
83
82
 
@@ -106,6 +105,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
106
105
  vb.auto_nat_dns_proxy = false
107
106
  vb.customize ["modifyvm", :id, "--natdnsproxy1", "off" ]
108
107
  vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off" ]
108
+ vb.customize ["modifyvm", :id, "--autostart-enabled", "on" ]
109
109
  end
110
110
  docker.vm.provision :file, :source => cloud_init_file.path, :destination => "/tmp/vagrantfile-user-data"
111
111
  docker.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
data/lib/kontena/machine/vagrant/Vagrantfile.node.rb.erb CHANGED
@@ -31,6 +31,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
31
31
  vb.auto_nat_dns_proxy = false
32
32
  vb.customize ["modifyvm", :id, "--natdnsproxy1", "off" ]
33
33
  vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off" ]
34
+ vb.customize ["modifyvm", :id, "--autostart-enabled", "on" ]
34
35
  end
35
36
  docker.vm.provision :file, :source => "<%= cloudinit %>", :destination => "/tmp/vagrantfile-user-data"
36
37
  docker.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
data/lib/kontena/machine/vagrant/cloudinit.yml CHANGED
@@ -7,7 +7,6 @@ write_files:
7
7
  KONTENA_URI=<%= master_uri %>
8
8
  KONTENA_TOKEN=<%= grid_token %>
9
9
  KONTENA_PEER_INTERFACE=eth1
10
- KONTENA_VERSION=<%= version %>
11
10
  - path: /etc/systemd/system/docker.service.d/50-krates.conf
12
11
  content: |
13
12
  [Service]
@@ -82,11 +81,11 @@ coreos:
82
81
  EnvironmentFile=/etc/krates-worker.env
83
82
  ExecStartPre=-/usr/bin/docker stop krates-worker
84
83
  ExecStartPre=-/usr/bin/docker rm krates-worker
85
- ExecStartPre=/usr/bin/docker pull krates/worker
84
+ ExecStartPre=/usr/bin/docker pull quay.io/krates/worker
86
85
  ExecStart=/usr/bin/docker run --name krates-worker \
87
86
  --env-file /etc/krates-worker.env \
88
87
  -v=/var/run/docker.sock:/var/run/docker.sock \
89
88
  -v=/etc/krates-worker.env:/etc/kontena.env \
90
89
  --net=host \
91
- krates/worker
90
+ quay.io/krates/worker
92
91
  ExecStop=/usr/bin/docker stop krates-worker
data/lib/kontena/plugin/vagrant.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Kontena
2
2
  module Plugin
3
3
  module Vagrant
4
- VERSION = "0.3.5"
4
+ VERSION = "0.3.6"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: krates-plugin-vagrant
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.5
4
+ version: 0.3.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Tsurbeleu
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-14 00:00:00.000000000 Z
11
+ date: 2021-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: krates