handling bionic #116

subutai-io · Apr 23, 2020 · 9ad386b · 9ad386b
1 parent 23c9c40
commit 9ad386b
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/bionic/Readme.md b/bionic/Readme.md
@@ -1,7 +1,7 @@
-Base Box `nat-xenial`
+Base Box `bionic`
 ======================
 
-This box builds a NAT'd Ubuntu Xenial RH or Peer based on configuration settings.
+This box builds an Ubuntu Bionic RH or Peer based on configuration settings.
 
 Unless stated otherwise all machine architectures are amd64.
 
diff --git a/bionic/hyperv/Vagrantfile b/bionic/hyperv/Vagrantfile
@@ -22,10 +22,10 @@ SubutaiConfig.print
 Vagrant.require_version '>= 2.0.1'
 
 Vagrant.configure('2') do |config|
-  config.vm.box = 'subutai/xenial'
+  config.vm.box = 'subutai/bionic'
   url = SubutaiConfig.url_of_cdn
   owner = 'subutai'
-  artifact_name = 'vagrant-subutai-xenial-hyperv.box'
+  artifact_name = 'vagrant-subutai-bionic-hyperv.box'
   config.vm.box_url = url + '/raw/download?id=' + SubutaiConfig.get_latest_id_artifact(owner, artifact_name)
   config.ssh.username = 'subutai'
 

diff --git a/bionic/hyperv/post-processor.jsonnet b/bionic/hyperv/post-processor.jsonnet
@@ -1,4 +1,4 @@
 {
   "output": "vagrant-subutai-{{user `vm_name`}}-hyperv-{{user `version`}}.box",
-  "vagrantfile_template": ".\\xenial\\hyperv\\Vagrantfile"
-}
+  "vagrantfile_template": ".\\bionic\\hyperv\\Vagrantfile"
+}
diff --git a/bionic/hyperv/provisioner.jsonnet b/bionic/hyperv/provisioner.jsonnet
@@ -13,7 +13,7 @@
           "echo Adding needed packages ...",
           "DEBIAN_FRONTEND=noninteractive apt-get -q -y install net-tools inotify-tools",
           "DEBIAN_FRONTEND=noninteractive apt-get -q -y install linux-cloud-tools-$(uname -r)",
-          "DEBIAN_FRONTEND=noninteractive apt-get -q -y install linux-virtual-lts-xenial linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial",
+          "DEBIAN_FRONTEND=noninteractive apt-get -q -y install linux-virtual-lts-bionic linux-tools-virtual-lts-bionic linux-cloud-tools-virtual-lts-bionic",
           "echo \"{{user `ssh_username`}}        ALL=(ALL)       NOPASSWD: ALL\" >> /etc/sudoers.d/{{user `ssh_username`}}",
           "chmod 440 /etc/sudoers.d/{{user `ssh_username`}}",
           "mkdir -pm 700 /home/{{user `ssh_username`}}/.ssh",

diff --git a/bionic/hyperv/template.jsonnet b/bionic/hyperv/template.jsonnet
@@ -1,6 +1,6 @@
 {
    "builders": [
-        import ".\\xenial\\hyperv\\builder.jsonnet",
+        import ".\\bionic\\hyperv\\builder.jsonnet",
    ],
    "post-processors": [
       [
@@ -11,7 +11,7 @@
                "hyperv-iso"
             ],
             "override": {
-               "hyperv": import ".\\xenial\\hyperv\\post-processor.jsonnet"
+               "hyperv": import ".\\bionic\\hyperv\\post-processor.jsonnet"
             },
             "type": "vagrant"
          }
@@ -20,15 +20,15 @@
   "provisioners": [
     {
       type: "file",
-      source: ".\\http\\xenial.sources.list",
+      source: ".\\http\\bionic.sources.list",
       destination: "/tmp/sources.list"
     },
     {
       "override": {
-        "hyperv-iso": import ".\\xenial\\hyperv\\provisioner.jsonnet",
+        "hyperv-iso": import ".\\bionic\\hyperv\\provisioner.jsonnet",
       },
       "type": "shell"
     },
   ],
-   "variables": import ".\\xenial\\variables.jsonnet"
-}
+   "variables": import ".\\bionic\\variables.jsonnet"
+}
diff --git a/bionic/libvirt/Vagrantfile b/bionic/libvirt/Vagrantfile
@@ -27,10 +27,10 @@ Vagrant.require_version '>= 2.0.1'
 
 Vagrant.configure('2') do |config|
 
-  config.vm.box = 'subutai/xenial'
+  config.vm.box = 'subutai/bionic'
   url = SubutaiConfig.url_of_cdn
   owner = 'subutai'
-  artifact_name = 'vagrant-subutai-xenial-libvirt.box'
+  artifact_name = 'vagrant-subutai-bionic-libvirt.box'
   config.vm.box_url = url + '/raw/download?id=' + SubutaiConfig.get_latest_id_artifact(owner, artifact_name)
   config.ssh.username = 'subutai'
 
@@ -160,4 +160,4 @@ Vagrant.configure('2') do |config|
                       path: 'https://raw.githubusercontent.com/subutai-io/packer/master/provisioning/en/logrotate.sh'
 
   config.vm.provision :cleanup
-end
+end
diff --git a/bionic/libvirt/post-processor.jsonnet b/bionic/libvirt/post-processor.jsonnet
@@ -1,4 +1,4 @@
 {
     "output": "vagrant-subutai-{{user `vm_name`}}-libvirt-{{user `version`}}.box",
-    "vagrantfile_template": "{{user `base_dir`}}/xenial/libvirt/branch/Vagrantfile",
+    "vagrantfile_template": "{{user `base_dir`}}/bionic/libvirt/branch/Vagrantfile",
 }
diff --git a/bionic/parallels/Vagrantfile b/bionic/parallels/Vagrantfile
@@ -27,7 +27,7 @@ Vagrant.require_version '>= 2.0.1'
 
 Vagrant.configure('2') do |config|
 
-  config.vm.box = 'subutai/xenial'
+  config.vm.box = 'subutai/bionic'
   config.ssh.username = 'subutai'
 
   config.vm.base_mac = SubutaiConfig.get(:_BASE_MAC)
@@ -117,4 +117,4 @@ Vagrant.configure('2') do |config|
                       path: 'https://raw.githubusercontent.com/subutai-io/packer/master/provisioning/en/logrotate.sh'
 
   config.vm.provision :cleanup
-end
+end
diff --git a/bionic/parallels/post-processor.jsonnet b/bionic/parallels/post-processor.jsonnet
@@ -1,4 +1,4 @@
 {
     "output": "vagrant-subutai-{{user `vm_name`}}-parallels-{{user `version`}}.box",
-    "vagrantfile_template": "{{user `base_dir`}}/xenial/parallels/branch/Vagrantfile",
+    "vagrantfile_template": "{{user `base_dir`}}/bionic/parallels/branch/Vagrantfile",
 }
diff --git a/bionic/template.jsonnet b/bionic/template.jsonnet
@@ -29,7 +29,7 @@
   "provisioners": [
     {
       type: "file",
-      source: "http/xenial.sources.list",
+      source: "http/bionic.sources.list",
       destination: "/tmp/sources.list"
     },
     {

diff --git a/bionic/variables.jsonnet b/bionic/variables.jsonnet
@@ -14,19 +14,19 @@
     "hostname": "subutai",
     "iso_checksum": "10fcd20619dce11fe094e960c85ba4a9",
     "iso_checksum_type": "md5",
-    "iso_name": "ubuntu-16.04.3-server-amd64.iso",
-    "iso_url": "http://releases.ubuntu.com/16.04.3/ubuntu-16.04.3-server-amd64.iso",
+    "iso_name": "ubuntu-18.04.4-live-server-amd64.iso",
+    "iso_url": "http://releases.ubuntu.com/bionic/ubuntu-18.04.4-live-server-amd64.iso",
     "keep_registered": "false",
     "locale": "en_US.UTF8",
     "memory": "4096",
     "null_host": "192.168.81.129",
-    "preseed": "xenial.cfg",
-    "preseed_virtio": "virtio/xenial.cfg",
+    "preseed": "bionic.cfg",
+    "preseed_virtio": "virtio/bionic.cfg",
     "proxy_on": "{{env `PROXY_ON`}}",
     "skip_export": "false",
     "ssh_username": "subutai",
     "ssh_password": "ubuntai",
     "version": "7.0.1",
     "virtualbox_guest_os_type": "Ubuntu_64",
-    "vm_name": "xenial"
+    "vm_name": "bionic"
 }
diff --git a/bionic/virtualbox/Vagrantfile b/bionic/virtualbox/Vagrantfile
@@ -26,10 +26,10 @@ SubutaiConfig.print
 Vagrant.require_version '>= 2.0.1'
 
 Vagrant.configure('2') do |config|
-  config.vm.box = 'subutai/xenial'
+  config.vm.box = 'subutai/bionic'
   url = SubutaiConfig.url_of_cdn
   owner = 'subutai'
-  artifact_name = 'vagrant-subutai-xenial-virtualbox.box'
+  artifact_name = 'vagrant-subutai-bionic-virtualbox.box'
   config.vm.box_url = url + '/raw/download?id=' + SubutaiConfig.get_latest_id_artifact(owner,artifact_name)
   config.ssh.username = 'subutai'
 
@@ -147,4 +147,4 @@ Vagrant.configure('2') do |config|
                       path: 'https://raw.githubusercontent.com/subutai-io/packer/master/provisioning/en/logrotate.sh'
 
   config.vm.provision :cleanup
-end
+end
diff --git a/bionic/virtualbox/post-processor.jsonnet b/bionic/virtualbox/post-processor.jsonnet
@@ -1,6 +1,6 @@
 {
   "output": "vagrant-subutai-{{user `vm_name`}}-virtualbox-{{user `version`}}.box",
-  "vagrantfile_template": "{{user `base_dir`}}/xenial/virtualbox/branch/Vagrantfile",
+  "vagrantfile_template": "{{user `base_dir`}}/bionic/virtualbox/branch/Vagrantfile",
   "include": [
   ]
-}
+}
diff --git a/bionic/vmware/Vagrantfile b/bionic/vmware/Vagrantfile
@@ -27,10 +27,10 @@ Vagrant.require_version '>= 2.0.1'
 
 Vagrant.configure('2') do |config|
 
-  config.vm.box = 'subutai/xenial'
+  config.vm.box = 'subutai/bionic'
   url = SubutaiConfig.url_of_cdn
   owner = 'subutai'
-  artifact_name = 'vagrant-subutai-xenial-vmware.box'
+  artifact_name = 'vagrant-subutai-bionic-vmware.box'
   config.vm.box_url = url + '/raw/download?id=' + SubutaiConfig.get_latest_id_artifact(owner, artifact_name)
   config.ssh.username = 'subutai'
 
@@ -147,4 +147,4 @@ Vagrant.configure('2') do |config|
                       path: 'https://raw.githubusercontent.com/subutai-io/packer/master/provisioning/en/logrotate.sh'
 
   config.vm.provision :cleanup
-end
+end
diff --git a/bionic/vmware/post-processor.jsonnet b/bionic/vmware/post-processor.jsonnet
@@ -1,4 +1,4 @@
 {
     "output": "vagrant-subutai-{{user `vm_name`}}-vmware-{{user `version`}}.box",
-    "vagrantfile_template": "{{user `base_dir`}}/xenial/vmware/branch/Vagrantfile",
+    "vagrantfile_template": "{{user `base_dir`}}/bionic/vmware/branch/Vagrantfile",
 }