vagrant-rancher 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fc0ab4dffdade295fb36426c3e1a7b6979763c
-  data.tar.gz: 7f8c27bd89e8c65c707282b8a28b10e9d4f8bd4b
+  metadata.gz: 5cc5f9f9ce9ca77cca5003504ebf18990b5a889c
+  data.tar.gz: 2237ae2b0cd21006ac30159ab52feff0e275dbea
 SHA512:
-  metadata.gz: 0b7d6c32011364096681eced5929074fa3d7dcf03e856066a7d2dc09e5c2673f4b57c92660a8f18c286cae0802c6ad5bca51e5e3ca579a2f7e6e9691a7de05e2
-  data.tar.gz: d01d57d525a84e44a34e519090a6d6f64b26692fe3c95f2c970d24e5f75b2dfd485ad190207c8f2676c57027204c9743e1831f42f695665231bd67ceaf8abdd4
+  metadata.gz: 0bec5ec68204cfaf5ef8e2c50138fe6685d1130e8fcfa4a37f3a712d03d806778cae184ad0a3123f86dbf678790ead9b63deb0ee95a6817d608154c9c66351fd
+  data.tar.gz: e3c094d730166f34309f395cb1d39ebb5f567e21750f452defede44be10f6aed292274c07b6bce2b947ac00f5e3a5e9ece91edb4f850ef6f325a167da99216d9

data/README.md

@@ -41,6 +41,8 @@ The `vagrant-rancher` plugin requires the hostname being set to either a DNS nam
 * `server_args` (*optional*, default: `''`): additional args to pass to the Docker run command when starting the Rancher server
 * `labels` (*optional*, default: `[]`): array of key=value pairs of labels to assign to the agent (ex. ["role=server","env=local"])
 * `deactivate` (*optional*, default: `false`): deactivate the host in Rancher to prevent it from being scheduled on
+* `project` (*optional*, default: `Default`): the project to start the agent in (project will be created if it doesn't exist)
+* `project_type` (*optional*, default: `cattle`): the project type (one of 'cattle', 'swarm', or 'kubernetes')
 
 ## Examples
 
@@ -50,6 +52,13 @@ See examples directory. For a quick setup of a Rancher environment running on Ra
 
 * VirtualBox
 
+## Development
+
+```
+bundle install
+bundle exec vagrant ...
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/nextrevision/vagrant-rancher.

data/examples/Vagrantfile.rancheros

@@ -20,6 +20,8 @@ Vagrant.configure(2) do |config|
 
     node.vm.provision :rancher do |rancher|
       rancher.hostname = "192.168.33.100"
+      rancher.project = "vagrant"
+      rancher.project_type = "swarm"
       rancher.deactivate = true
       rancher.labels = ["role=server"]
     end

data/lib/vagrant-rancher/config.rb

@@ -8,6 +8,8 @@ module VagrantPlugins
       attr_accessor :deactivate
       attr_accessor :server_args
       attr_accessor :labels
+      attr_accessor :project
+      attr_accessor :project_type
 
       def initialize
         @role = UNSET_VALUE
@@ -17,6 +19,8 @@ module VagrantPlugins
         @server_args = UNSET_VALUE
         @labels = UNSET_VALUE
         @deactivate = UNSET_VALUE
+        @project = UNSET_VALUE
+        @project_type = UNSET_VALUE
       end
 
       def finalize!
@@ -27,6 +31,8 @@ module VagrantPlugins
         @server_args = nil if @server_args == UNSET_VALUE
         @labels = nil if @labels == UNSET_VALUE
         @deactivate = false if @deactivate == UNSET_VALUE
+        @project = 'Default' if @project == UNSET_VALUE
+        @project_type = 'cattle' if @project_type == UNSET_VALUE
       end
 
       def validate(_machine)
@@ -60,6 +66,14 @@ module VagrantPlugins
           errors << ':rancher provisioner requires deactivate to be a bool'
         end
 
+        unless project.is_a?(String) || project.nil?
+          errors << ':rancher provisioner requires project to be a string'
+        end
+
+        unless ['cattle', 'kubernetes', 'swarm'].include? project_type || project_type.nil?
+          errors << ':rancher provisioner requires project_type to be one of cattle, kubernetes or swarm'
+        end
+
         { 'rancher provisioner' => errors }
       end
     end

data/lib/vagrant-rancher/provisioner.rb

@@ -12,15 +12,11 @@ module VagrantPlugins
       def provision
         self.check_docker
 
-        if config.role == 'server'
-          self.install_server
-          self.configure_server
-        end
+        self.install_server if config.role == 'server'
 
-        if config.role == 'server' || config.role == 'agent'
-          self.install_agent
-          self.configure_agent
-        end
+        self.configure_server
+        self.install_agent
+        self.configure_agent
       end
 
       # determines if we can reach the docker daemon
@@ -65,9 +61,40 @@ module VagrantPlugins
 
       # configures a running server with the required settings
       def configure_server
-        # retrieve the default project id
-        project_id = @rancher.get_project_id
-        raise Errors::ProjectNotFound if project_id.nil?
+        # get the specified project
+        project_id = @rancher.get_project_id @config.project
+
+        # verify the project is of the correct type
+        unless project_id.nil?
+          recreate = false
+          project = @rancher.get_project project_id
+          if project['kubernetes'] and @config.project_type != 'kubernetes'
+            recreate = true
+          elsif project['swarm'] and @config.project_type != 'swarm'
+            recreate = true
+          elsif @config.project_type == 'cattle' and (project['kubernetes'] or project['swarm'])
+            recreate = true
+          end
+
+          # destroy the project and set project_id to nil when
+          # the project is not the specified type
+          if recreate
+            @rancher.delete_project project_id
+            project_id = nil
+          end
+        end
+
+        # create the project if it doesn't exist
+        if project_id.nil?
+          @machine.ui.detail "Project does not exist, creating now..."
+          @rancher.create_project @config.project, @config.project_type
+          project_id = @rancher.get_project_id @config.project
+          raise Errors::ProjectNotFound if project_id.nil?
+        end
+
+        # set the default project for the admin user
+        user_id = @rancher.get_admin_id
+        @rancher.set_default_project user_id, project_id
 
         # attempt to retrieve a registration token, otherwise create one
         unless @rancher.get_registration_token project_id
@@ -88,7 +115,7 @@ module VagrantPlugins
         # if the agent container is not running, start it
         unless @machine.communicate.test('sudo docker inspect rancher-agent')
           # retrieve the default project id
-          project_id = @rancher.get_project_id
+          project_id = @rancher.get_project_id @config.project
           raise Errors::ProjectNotFound if project_id.nil?
 
           # retrieve the registration token
@@ -119,7 +146,7 @@ module VagrantPlugins
           # wait for the agent to register the host in rancher (checks
           # for the @machine.id in the host labels)
           @machine.ui.detail 'Waiting for agent to register...'
-          unless @rancher.wait_for_agent @machine.id
+          unless @rancher.wait_for_agent project_id, @machine.id
             raise Errors::AgentRegistrationTimeout,
               :host => @config.hostname,
               :port => @config.port
@@ -130,7 +157,7 @@ module VagrantPlugins
       # configure the agent in rancher
       def configure_agent
         # retrieve the project id
-        project_id = @rancher.get_project_id
+        project_id = @rancher.get_project_id @config.project
         raise Errors::ProjectNotFound if project_id.nil?
 
         # retrieve the host by the @machine.id label

data/lib/vagrant-rancher/rancher.rb

@@ -27,10 +27,7 @@ module VagrantPlugins
       end
 
       # waits for the agent to register the host
-      def wait_for_agent(machine_id)
-        project_id = self.get_project_id
-        raise Errors::ProjectNotFound if project_id.nil?
-
+      def wait_for_agent(project_id, machine_id)
         15.times do |i|
           host = self.get_host project_id, machine_id
           break unless host.nil?
@@ -42,14 +39,14 @@ module VagrantPlugins
       end
 
       # retrieves the Default project id
-      def get_project_id
+      def get_project_id(name)
         project_id = nil
 
         response = self.api '/v1/projects'
 
         unless response.nil? or response['data'].empty?
           response['data'].each do |project|
-            if project['name'] == 'Default'
+            if project['name'] == name
               project_id = project['id']
             end
           end
@@ -58,6 +55,17 @@ module VagrantPlugins
         project_id
       end
 
+      # retrieves and returns a project object
+      def get_project(project_id)
+        return self.api "/v1/projects/#{project_id}"
+      end
+
+      # retrieves and returns the id of the admin user
+      def get_admin_id
+        response = self.api '/v1/accounts?name=admin&kind=admin'
+        return response['data'][0]['id']
+      end
+
       # retrieves a rancher host object
       def get_host(project_id, machine_id)
         host = nil
@@ -82,6 +90,55 @@ module VagrantPlugins
         nil
       end
 
+      # creates a new project
+      def create_project(name, type='cattle')
+        swarm = false
+        kubernetes = false
+
+        case type
+        when 'kubernetes'
+          kubernetes = true
+        when 'swarm'
+          swarm = true
+        end
+
+        data = {
+          'name'       => name,
+          'swarm'      => swarm,
+          'kubernetes' => kubernetes,
+          'publicDns'  => false,
+          'members'    => []
+        }
+        return self.api '/v1/project/', 'POST', nil, data
+      end
+
+      # sets the default project for a user
+      def set_default_project(user_id, project_id)
+        response = self.api "/v1/userpreferences?accountId=#{user_id}&name=defaultProjectId"
+
+        data = {
+          'name'      => 'defaultProjectId',
+          'value'     => project_id,
+          'kind'      => 'userPreference',
+          'type'      => 'userPreference',
+          'accountId' => user_id,
+        }
+
+        if response['data'].empty?
+          self.api '/v1/userpreferences/', 'POST', nil, data
+        else
+          preference_id = response['data'][0]['id']
+          self.api "/v1/userpreferences/#{preference_id}/?action=update", 'POST', nil, data
+        end
+      end
+
+      # deletes a project
+      def delete_project(project_id)
+        self.api "/v1/projects/#{project_id}/?action=delete", 'POST'
+        sleep 2
+        self.api "/v1/projects/#{project_id}/?action=purge", 'POST'
+      end
+
       # creates a registration token for a project
       def create_registration_token(project_id)
         headers = { 'x-api-project-id' => project_id }
@@ -96,7 +153,7 @@ module VagrantPlugins
       # deactivates a host in rancher to avoid being scheduled on
       def deactivate_host(project_id, host_id)
         headers = { 'x-api-project-id' => project_id }
-        self.api "/v1/projects/#{project_id}/hosts/#{host_id}/?action=deactivate", 'POST'
+        self.api "/v1/projects/#{project_id}/hosts/#{host_id}/?action=deactivate", 'POST', headers
       end
 
       protected

data/lib/vagrant-rancher/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rancher
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rancher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - nextrevision
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler