egon 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODI2YTNiNDM5NGU1NTBlZTc3NGM5M2ViNjI2YWEyNzg4ZDRhZDg2ZA==
+    NzE0ZTI5YTgxYTNlYWI1ZjE1MjgwZGVkZDc3MzA5NDkyNWQxMjdhMA==
   data.tar.gz: !binary |-
-    MTJlMDY5OTA1YTk3MzgwNWJkNTk4ZWMxZmIwMGFjNjJhOTkyYTRjMg==
+    ODg3OTk1MjMyMDQ3OTg0MTJhNGU3ZTYwZjQzNTUzZDViYjg1YWYzOA==
 SHA512:
   metadata.gz: !binary |-
-    MGJlYjMyNzhlYTc2ZWE1Nzc3ZjFhMWZjM2U1YTA3MmMyZmE2NzEzOTA3YTVk
-    MzAyMDNkOGM0ZGFiMmU4OWY5ZDg4YjIwYTQzYjM1ZjMyZmIyYjg4NWY0Y2Rh
-    Y2RlZjA5MzA5ZmZhZjQ1MGQ4ZjgwNTRlYzc3MmNlYmFlYWM2ODM=
+    YzJiMmFlZTZmZDlkMDMxZDM5NGJkZjMyNDgzZjk1NDNhZGZmYjQ0ZTcwMGRj
+    NGM0OGQwODkwZmIyM2I3NjAxZGVmMWFjNzFiOGRlNmFiYmRkZTY4NzYyYzU3
+    ZWU1YzUwNWUyZmI5YzFmNGQyMDg5MDUzYTVkNDRlNGM0ZDNiZTc=
   data.tar.gz: !binary |-
-    MTVkOWFjOWM5MjZiYTJiNDhhMWNkMGFmYzNkMTZlYTk3YWJiNmRmMzQzZGVh
-    OTdmZDI0MjU2MWY1MmFkMzk2MzI3Mzg5N2I4OTBjODBkZDVjNDExY2NiMDUx
-    YjljNTI0NmYyZjU0MjQ0YTk1YTJjNTE2OTAxMmM2Y2VkYzc4MGI=
+    YmI4MTA2N2MwNzU5Yzc4N2U0YTM2OTVkZjBjYzM5NDJkZjhmYmUwMWIxZTQ1
+    ZGYwNWE1Y2E0NTU3YzI2OGVmZTliMWFlMzVjZDhlNmY4NGZhZTE0ZGE3YWZi
+    YTY2MTFkZWQzZjcxN2M3ODA5ZjVjZjJiMjE3NzJmN2NkYmZmMjU=

data/bin/undercloud-install-local.rb

@@ -0,0 +1,6 @@
+require 'egon/undercloud/commands'
+require 'egon/undercloud/installer'
+
+installer = Egon::Undercloud::Installer.new
+installer.install(Egon::Undercloud::Commands.OSP7_no_registration)
+installer.check_ports

data/lib/egon/undercloud/commands.rb

@@ -8,8 +8,7 @@ module Egon
         curl -k -O #{satellite_url}/pub/katello-ca-consumer-latest.noarch.rpm
         sudo yum install -y katello-ca-consumer-latest.noarch.rpm
         sudo subscription-manager register --org=\"#{org}\" --activationkey=\"#{activation_key}\"
-        sudo yum clean all
-        #{OSP7_COMMON}"
+        #{self.OSP7_COMMON_no_registration}"
       end
     
       def self.OSP7_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)
@@ -19,19 +18,28 @@ module Egon
         sudo subscription-manager repos --enable=rhel-7-server-rpms \
          --enable=rhel-7-server-optional-rpms --enable=rhel-7-server-extras-rpms \
          --enable=rhel-7-server-openstack-6.0-rpms
-        #{OSP7_COMMON}"
+        #{self.OSP7_no_registration}"
       end
     
-      def self.OSP7_instack_virt
+      def self.OSP7_no_registration
+        return "
+        sudo yum install -y python-rdomanager-oscplugin
+        if [ ! -f ~/undercloud.conf ]; then
+          cp -f /usr/share/instack-undercloud/undercloud.conf.sample ~/undercloud.conf;
+        fi
+        #{self.OSP7_no_registration_no_packages}"
+      end
+
+      def self.OSP7_no_registration_no_packages
         return OSP7_COMMON
       end
 
       POST_INSTALL = "
-      source stackrc
-      source tripleo-undercloud-passwords
+      source ~/stackrc
+      source ~/tripleo-undercloud-passwords
 
-      tripleo setup-overcloud-passwords -o tripleo-overcloud-passwords
-      source tripleo-overcloud-passwords
+      tripleo setup-overcloud-passwords -o ~/tripleo-overcloud-passwords
+      source ~/tripleo-overcloud-passwords
       NeutronFlatNetworks=${NeutronFlatNetworks:-'datacentre'}
       NeutronPhysicalBridge=${NeutronPhysicalBridge:-'br-ex'}
       NeutronBridgeMappings=${NeutronBridgeMappings:-'datacentre:br-ex'}
@@ -222,19 +230,13 @@ module Egon
       "
 
       OSP7_COMMON = "
-      sudo yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
-      sudo yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm
-      sudo curl -o /etc/yum.repos.d/rdo-management-trunk.repo http://trunk-mgt.rdoproject.org/centos-kilo/current-passed-ci/delorean-rdo-management.repo
-      sudo yum install -y python-rdomanager-oscplugin
-      # TODO: answers file should come from RHCI
-      cp -f /usr/share/instack-undercloud/undercloud.conf.sample ~/undercloud.conf;
-      # TODO: for baremetal a nodes.csv file may also be required
       openstack undercloud install
-      sudo cp /root/tripleo-undercloud-passwords .
-      sudo chown $USER: tripleo-undercloud-passwords
-      sudo cp /root/stackrc .
-      sudo chown $USER: stackrc
+      sudo cp /root/tripleo-undercloud-passwords ~
+      sudo chown $USER: ~/tripleo-undercloud-passwords
+      sudo cp /root/stackrc ~
+      sudo chown $USER: ~/stackrc
       #{POST_INSTALL}"
+
     end
   end  
 end

data/lib/egon/undercloud/installer.rb

@@ -1,50 +1,69 @@
+require 'egon/undercloud/port-check-mixin'
+require 'stringio'
+
 module Egon
   module Undercloud
     class Installer
+      include PortCheckMixin
+
       attr_reader :started
       alias_method :started?, :started
-    
-      def initialize(connection)
+
+      # installs locally if ssh connection is not provided
+      def initialize(connection=nil)
         @connection = connection
         @completed = false
         @started = false
         @failure = false
       end
-      
+
       def completed?
         @completed
       end
-    
+
       def set_completed(bool)
         @completed = bool
       end
-    
+
       def failure?
         @failure
       end
-    
+
       def set_failure(bool)
         @failure = bool
       end
-    
+
       def install(commands, stringio=nil)
         @started = true
         @completed = false
-             
-        @connection.on_complete(lambda { set_completed(true) })
-        @connection.on_failure(lambda { set_failure(true) })
-    
-        Thread.new {
-          @connection.execute(commands, stringio)
-        }
+
+        if !@connection.nil?
+          # remote install
+          @connection.on_complete(lambda { set_completed(true) })
+          @connection.on_failure(lambda { set_failure(true) })
+
+          Thread.new {
+            @connection.execute(commands, stringio)
+          }
+        else
+          # local install
+          set_failure(true) unless system(commands)
+          set_completed(true)
+        end
       end
 
       def check_ports(stringio=nil)
         # closed ports 5385, 36357
         ports = [8774, 9292, 8777, 9696, 8004, 5000, 8585, 15672]
         ports.each do |p|
-          if !@connection.port_open?(p, stringio)
-            set_failure(true)
+          if !@connection.nil?
+            # remote check
+            if !@connection.remote_port_open?(p, stringio)
+              set_failure(true)
+            end
+          else
+            # local check
+            set_failure(true) unless !port_open?("192.0.2.1", p, stringio)
           end
         end
       end

data/lib/egon/undercloud/port-check-mixin.rb

@@ -0,0 +1,29 @@
+require 'net/http'
+
+module Egon
+  module Undercloud
+    module PortCheckMixin
+
+      def stringio_write(stringio, text)
+        $stdout.puts text if stringio.nil?
+        stringio.puts text unless stringio.nil?
+      end
+
+      def port_open?(ip, port, stringio=nil)
+        begin
+          url = "http://#{ip}:#{port}"
+          stringio_write(stringio, "Testing #{url}")
+          res = Net::HTTP.get_response(URI(url))
+          stringio_write(stringio, res.body)
+          stringio_write(stringio, "Port #{port} is open")
+          true
+        rescue => e
+          stringio_write(stringio, e.message)
+          stringio_write(stringio, e.backtrace)
+          stringio_write(stringio, "Port #{port} is closed")
+          false
+        end
+      end
+    end
+  end
+end

data/lib/egon/undercloud/ssh-connection.rb

@@ -1,3 +1,4 @@
+require 'egon/undercloud/port-check-mixin'
 require 'net/http'
 require 'net/ssh'
 require 'stringio'
@@ -8,6 +9,8 @@ require 'stringio'
 module Egon
   module Undercloud
     class SSHConnection
+      include PortCheckMixin
+
       def initialize(host, user, password)
         @host = host
         @user = user
@@ -19,7 +22,7 @@ module Egon
         stringio.puts text unless stringio.nil?
       end
 
-      def port_open?(port, stringio=nil, local_ip="127.0.0.1", remote_ip="192.0.2.1", seconds=1)
+      def remote_port_open?(port, stringio=nil, local_ip="127.0.0.1", remote_ip="192.0.2.1", seconds=1)
         t = Thread.new {
           begin
             Net::SSH.start(@host, @user, :password => @password, :timeout => seconds,
@@ -35,39 +38,27 @@ module Egon
         }
 
         sleep 1
-        begin
-          url = "http://#{local_ip}:#{port}"
-          stringio_write(stringio, "Testing #{url}")
-          res = Net::HTTP.get_response(URI(url))
-          stringio_write(stringio, res.body)
-          stringio_write(stringio, "Port #{port} is open")
-          t.kill
-          true
-        rescue => e
-          stringio_write(stringio, e.message)
-          stringio_write(stringio, e.backtrace)
-          stringio_write(stringio, "Port #{port} is closed")
-          t.kill
-          false
-        end
+        port_status = port_open?(local_ip, port, stringio)
+        t.kill
+        port_status
       end
-    
+
       def call_complete
         @on_complete.call if @on_complete
       end
-        
+
       def on_complete(hook)
         @on_complete = hook
       end
-    
+
       def call_failure
         @on_failure.call if @on_failure
       end
-    
+
       def on_failure(hook)
         @on_failure = hook
       end
-    
+
       def execute(commands, stringio = nil)
         begin
           # :timeout => how long to wait for the initial connection to be made
@@ -86,23 +77,23 @@ module Egon
               end
               ch.exec commands do |ch, success|
                 call_failure unless success
-      
+
                 # "on_data" is called when the process writes something to stdout
                 ch.on_data do |c, data|
                   stringio_write(stringio, data)
                 end
-      
+
                 # "on_extended_data" is called when the process writes something to stderr
                 ch.on_extended_data do |c, type, data|
                   $stderr.print data if stringio.nil?
                   stringio_write(stringio, data)
                   call_failure
                 end
-      
+
                 ch.on_close { call_complete }
               end
             end
-      
+
             channel.wait
           end
           call_complete

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/test_ssh_connection.rb

@@ -12,6 +12,6 @@ describe "SSHConnection" do
 
   it "check port is open" do
     connection = Egon::Undercloud::SSHConnection.new("127.0.0.1", "stack", "test")
-    connection.port_open?(1111).should eq false
+    connection.remote_port_open?(1111).should eq false
     end
 end

data/test/test_undercloud.rb

@@ -59,4 +59,31 @@ describe "undercloud installer" do
     expect(io.string).to include("Testing")
   end
 end
-  
+
+describe "local installer" do
+
+  before do
+    @installer = Egon::Undercloud::Installer.new
+  end
+
+  it "local installer runs successfully" do
+    @installer.install("date")
+    while !@installer.completed?
+      sleep 1
+    end
+    expect(@installer.failure?).to be false
+
+    io = StringIO.new
+    @installer.check_ports(io)
+    expect(io.string).to include("Testing")
+  end
+
+  it "local install fails and is detected" do
+    @installer.install("blah")
+    while !@installer.completed?
+      sleep 1
+    end
+    expect(@installer.failure?).to be true
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ description: ''
 email:
 - foreman-dev+egon@googlegroups.com
 executables:
-- undercloud-install-instack-virt.rb
+- undercloud-install-local.rb
 - undercloud-install-satellite.rb
 - undercloud-install-vanilla-rhel.rb
 extensions: []
@@ -96,7 +96,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/undercloud-install-instack-virt.rb
+- bin/undercloud-install-local.rb
 - bin/undercloud-install-satellite.rb
 - bin/undercloud-install-vanilla-rhel.rb
 - egon.gemspec
@@ -109,6 +109,7 @@ files:
 - lib/egon/overcloud/undercloud_handle/node.rb
 - lib/egon/undercloud/commands.rb
 - lib/egon/undercloud/installer.rb
+- lib/egon/undercloud/port-check-mixin.rb
 - lib/egon/undercloud/ssh-connection.rb
 - lib/egon/version.rb
 - rubygem-egon.spec

data/bin/undercloud-install-instack-virt.rb

@@ -1,15 +0,0 @@
-require 'egon/undercloud/commands'
-require 'egon/undercloud/ssh-connection'
-require 'egon/undercloud/installer'
-
-SSH_HOST = ARGV[0]
-SSH_USER = ARGV[1]
-SSH_PASSWORD = ARGV[2]
-
-connection = Egon::Undercloud::SSHConnection.new(SSH_HOST, SSH_USER, SSH_PASSWORD)
-installer = Egon::Undercloud::Installer.new(connection)
-installer.install(Egon::Undercloud::Commands.OSP7_instack_virt)
-while !installer.completed?
-  sleep 1
-end  
-installer.check_ports