Bläddra i källkod

Merge pull request #2654 from detiber/nix_vagrant

Remove Vagrantfile
Scott Dodson 8 år sedan
förälder
incheckning
1f28e81f3e
2 ändrade filer med 1 tillägg och 123 borttagningar
  1. 1 52
      README_vagrant.md
  2. 0 71
      Vagrantfile

+ 1 - 52
README_vagrant.md

@@ -1,52 +1 @@
-:warning: **WARNING** :warning: This feature is community supported and has not been tested by Red Hat. Visit [docs.openshift.com](https://docs.openshift.com) for [OpenShift Enterprise](https://docs.openshift.com/enterprise/latest/install_config/install/index.html) or [OpenShift Origin](https://docs.openshift.org/latest/install_config/install/index.html) supported installation docs.
-
-Requirements
-------------
-- ansible (the latest 1.9 release is preferred, but any version greater than 1.9.1 should be sufficient).
-- vagrant (tested against version 1.7.2)
-- vagrant-hostmanager plugin (tested against version 1.5.0)
-- vagrant-libvirt (tested against version 0.0.26)
-  - Only required if using libvirt instead of virtualbox
-
-For ``enterprise`` deployment types the base RHEL box has to be added to Vagrant:
-
-1. Download the RHEL7 vagrant image (libvirt or virtualbox) available from the [Red Hat Container Development Kit downloads in the customer portal](https://access.redhat.com/downloads/content/293/ver=1/rhel---7/1.0.1/x86_64/product-downloads)
-
-2. Install it into vagrant
-
-   ``$ vagrant box add --name rhel-7 /path/to/rhel-server-libvirt-7.1-3.x86_64.box``
-
-3. (optional, recommended) Increase the disk size of the image to 20GB - This is a two step process. (these instructions are specific to libvirt)
-
-    Resize the actual qcow2 image:
-
-	``$ qemu-img resize ~/.vagrant.d/boxes/rhel-7/0/libvirt/box.img 20GB``
-
-    Edit `~/.vagrant.d/boxes/rhel-7/0/libvirt/metadata.json` to reflect the new size.  A corrected metadata.json looks like this:
-
-	``{"provider": "libvirt", "format": "qcow2", "virtual_size": 20}``
-
-Usage
------
-```
-vagrant up --no-provision
-vagrant provision
-```
-
-Using libvirt:
-```
-vagrant up --provider=libvirt --no-provision
-vagrant provision
-```
-
-Environment Variables
----------------------
-The following environment variables can be overridden:
-- ``OPENSHIFT_DEPLOYMENT_TYPE`` (defaults to origin, choices: origin, openshift-enterprise)
-- ``OPENSHIFT_NUM_NODES`` (the number of nodes to create, defaults to 2)
-
-Note that if ``OPENSHIFT_DEPLOYMENT_TYPE`` is ``enterprise`` you should also specify environment variables related to ``subscription-manager`` which are used by the ``rhel_subscribe`` role:
-
-- ``rhel_subscription_user``: rhsm user
-- ``rhel_subscription_pass``: rhsm password
-- (optional) ``rhel_subscription_pool``: poolID to attach a specific subscription besides what auto-attach detects
+The Vagrant-based installation has been moved to: https://github.com/openshift/openshift-ansible-contrib/tree/master/vagrant

+ 0 - 71
Vagrantfile

@@ -1,71 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-VAGRANTFILE_API_VERSION = "2"
-
-unless Vagrant.has_plugin?("vagrant-hostmanager")
-  raise 'vagrant-hostmanager plugin is required'
-end
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  deployment_type = ENV['OPENSHIFT_DEPLOYMENT_TYPE'] || 'origin'
-  num_nodes = (ENV['OPENSHIFT_NUM_NODES'] || 2).to_i
-
-  config.hostmanager.enabled = true
-  config.hostmanager.manage_host = true
-  config.hostmanager.include_offline = true
-  config.ssh.insert_key = false
-
-  config.vm.provider "virtualbox" do |vbox, override|
-    override.vm.box = "centos/7"
-    vbox.memory = 1024
-    vbox.cpus = 2
-
-    # Enable multiple guest CPUs if available
-    vbox.customize ["modifyvm", :id, "--ioapic", "on"]
-  end
-
-  config.vm.provider "libvirt" do |libvirt, override|
-    libvirt.cpus = 2
-    libvirt.memory = 1024
-    libvirt.driver = 'kvm'
-    case deployment_type
-    when "openshift-enterprise"
-      override.vm.box = "rhel-7"
-    when "atomic-enterprise"
-      override.vm.box = "rhel-7"
-    when "origin"
-      override.vm.box = "centos/7"
-      override.vm.box_download_checksum = "b2a9f7421e04e73a5acad6fbaf4e9aba78b5aeabf4230eebacc9942e577c1e05"
-      override.vm.box_download_checksum_type = "sha256"
-    end
-  end
-
-  num_nodes.times do |n|
-    node_index = n+1
-    config.vm.define "node#{node_index}" do |node|
-      node.vm.hostname = "ose3-node#{node_index}.example.com"
-      node.vm.network :private_network, ip: "192.168.100.#{200 + n}"
-      config.vm.provision "shell", inline: "nmcli connection reload; systemctl restart NetworkManager.service"
-    end
-  end
-
-  config.vm.define "master" do |master|
-    master.vm.hostname = "ose3-master.example.com"
-    master.vm.network :private_network, ip: "192.168.100.100"
-    master.vm.network :forwarded_port, guest: 8443, host: 8443
-    config.vm.provision "shell", inline: "nmcli connection reload; systemctl restart NetworkManager.service"
-    master.vm.provision "ansible" do |ansible|
-      ansible.limit = 'all'
-      ansible.sudo = true
-      ansible.groups = {
-        "masters" => ["master"],
-        "nodes"   => ["master", "node1", "node2"],
-      }
-      ansible.extra_vars = {
-        deployment_type: deployment_type,
-      }
-      ansible.playbook = "playbooks/byo/vagrant.yml"
-    end
-  end
-end