egon 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWRmYjhkMWYyMTg1MzRiMjEwYTM5YjlhNjQ0NjhmOGU5ZmUyODQ3OA==
+    ZDcyY2IwNmU3NGJiZTUzZTA0YzEwNmRlN2ZmMjYzZjBjNjNjODFjOQ==
   data.tar.gz: !binary |-
-    OTY2ZGFjNTdhNWJhOTA3ZmRiMzg1YWI3NjdmMzFkNzRjM2RjMGM2Yw==
+    ZGY3YTNkM2VjYjMwYzhkYTkxZjZmNjg3ZThjYTU3Y2UxNTdmZTAzNA==
 SHA512:
   metadata.gz: !binary |-
-    NzM1NDlmYTE2YWQzMjgzOTQ1MjA2NmRmZWZjYmI3MTI0YzIyMzg2YTkyMGRl
-    NzhmMjYwOGMzMmU4YmZmYzgxN2I2NTVmZGEyZWIyZjg5NmI4ZjBiZjllYzRj
-    OTI4MjQwYzhiMGIyMDRiZjQ3MjUwM2RlZjQwNzg3OWI5MzVhODk=
+    OGVhOWJkNmQ0M2U4ODk2MGU1M2YwMTc5ZjZhMjU0NjY2MjRiNzI0OGI4YTZm
+    NWNkMjE5NTBmNGE1ZjIyOWZhNmY3M2I1NTYwYjBiNTVmMmFmOTU4OTUzMDdh
+    ZDRmMGE5NDIyZDdmNWMwNjAzNGFjNzlmMjYyZTYxMzNhZTliYjk=
   data.tar.gz: !binary |-
-    MjA0ZmQ2NTEwMmQ0M2MyOTJlYzM5Zjc5YWY5M2EyNmQ5ZDJmMGU4Nzg3ODkx
-    NTk2MDI0Y2E1NmEyNzRhMDNmNmVlMGYzMzJiMWIzM2E1ZjgxNzQ1NjVhMzk5
-    MDc1NmU2Y2UyNDZjMGJjMjIxNjMyMTk1NDVhOTIzMjE5MjU5ZjY=
+    ZWNkYzU2YWNiMDg4M2MyMzk0ODlmY2U3NWUyNzNhM2I1M2M2NjEzYjczZjZk
+    ODBiNDhkNjZlOTEzZWQwMTZmMDNjNjc5NDkyNzY1NWIyNmQ2ZjNmMzNlMDg4
+    ZmIxMjQ5NTM2OGE0ZjU2ODAwNzE3YjNkYTAxYzgzZTEwMTM4Y2Y=

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

@@ -12,3 +12,4 @@ installer.install(Egon::Undercloud::Commands.OSP7_instack_virt)
 while !installer.completed?
   sleep 1
 end  
+installer.check_ports

data/bin/undercloud-install-satellite.rb

@@ -18,3 +18,4 @@ installer.install(Egon::Undercloud::Commands.OSP7_satellite(SATELLITE_URL, SATEL
 while !installer.completed?
   sleep 1
 end  
+installer.check_ports

data/bin/undercloud-install-vanilla-rhel.rb

@@ -16,3 +16,4 @@ installer.install(Egon::Undercloud::Commands.OSP7_vanilla_rhel(RHSM_USER, RHSM_P
 while !installer.completed?
   sleep 1
 end  
+installer.check_ports

data/egon.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fog", "~> 1.31.0"
   s.add_development_dependency "net-ssh", "~> 2.9.2"
   s.add_development_dependency "rspec", "~> 3.2.0"
+  s.add_development_dependency "curb", "~> 0.8.8"
 end

data/lib/egon/overcloud/undercloud_handle/deployment.rb

@@ -27,13 +27,16 @@ module Overcloud
     def deploy_plan(plan_name)
       plan = get_plan(plan_name)
       templates = Hash[plan.provider_resource_templates]
+
       # temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1212740
-      templates["manifests/overcloud_object.pp"] = templates["puppet/manifests/overcloud_object.pp"]
-      templates["manifests/ringbuilder.pp"] = templates["puppet/manifests/ringbuilder.pp"]
-      templates["manifests/overcloud_compute.pp"] = templates["puppet/manifests/overcloud_compute.pp"]
-      templates["manifests/overcloud_controller.pp"] = templates["puppet/manifests/overcloud_controller.pp"]
-      templates["manifests/overcloud_volume.pp"] = templates["puppet/manifests/overcloud_volume.pp"]
-      templates["manifests/overcloud_cephstorage.pp"] = templates["puppet/manifests/overcloud_cephstorage.pp"]
+      templates.keys.each do |template_path|
+        if template_path.index('puppet/') == 0
+          new_template_path = template_path.sub('puppet/','')
+          templates[new_template_path] = templates[template_path]
+        end
+      end
+      templates["hieradata/RedHat.yaml"] = templates["puppet/hieradata/RedHat.yaml"]
+      templates["yum_update.sh"] = templates["extraconfig/tasks/yum_update.sh"]
 
       stack_parameters = {
         :stack_name => plan.name,

data/lib/egon/overcloud/undercloud_handle/flavor.rb

@@ -41,8 +41,6 @@ module Overcloud
         :extra_specs => {
           :cpu_arch => cpu_arch,
           :'capabilities:boot_option' => 'local',
-          :'baremetal:deploy_kernel_id' => get_baremetal_deploy_kernel_image.id,
-          :'baremetal:deploy_ramdisk_id' => get_baremetal_deploy_ramdisk_image.id
         }
       }
       

data/lib/egon/undercloud/commands.rb

@@ -27,7 +27,7 @@ module Egon
       end
     
       OSP7_COMMON = "
-      sudo yum install -y http://mirrors.einstein.yu.edu/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
+      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

data/lib/egon/undercloud/installer.rb

@@ -38,6 +38,16 @@ module Egon
           @connection.execute(commands)
         }
       end
+
+      def check_ports
+        # closed ports 5385, 36357
+        ports = [8774, 9292, 8777, 9696, 8004, 5000, 8585, 5672]
+        ports.each do |p|
+          if !@connection.port_open?(p)
+            set_failure(true)
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,3 +1,4 @@
+require 'curb'
 require 'net/ssh'
 require 'stringio'
 
@@ -12,6 +13,33 @@ module Egon
         @user = user
         @password = password
       end
+
+      def port_open?(port, local_ip="127.0.0.1", remote_ip="192.0.2.1", seconds=1)
+        t = Thread.new {
+          Net::SSH.start(@host, @user, :password => @password, :timeout => 2,
+                       :auth_methods => ["password"],
+                       :number_of_password_prompts => 0) do |session|
+            puts "Forwarding #{port} #{remote_ip} #{port}"
+            session.forward.local( port, remote_ip, port )
+            session.loop { true }
+          end
+        }
+
+        sleep 1
+        begin
+          url = "#{local_ip}:#{port}"
+          puts "Testing #{url}"
+          http = Curl.get(url)
+          puts http.body_str
+          puts "Port #{port} is open"
+          t.kill
+          true
+        rescue Curl::Err::GotNothingError, Curl::Err::ConnectionFailedError
+          puts "Port #{port} is closed"
+          t.kill
+          false
+        end
+      end
     
       def call_complete
         @on_complete.call if @on_complete

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/test_ssh_connection.rb

@@ -10,4 +10,8 @@ describe "SSHConnection" do
     expect(io.string.strip!).to eq("execution expired")
   end
 
+  it "check port is open" do
+    connection = Egon::Undercloud::SSHConnection.new("127.0.0.1", "stack", "test")
+    connection.port_open?(1111).should eq false
+    end
 end

data/test/test_undercloud.rb

@@ -40,6 +40,11 @@ describe "undercloud installer" do
   it "connection should timeout and installer indicate failure" do
     run_and_assert_installer(@installer, true)
   end
+
+  it "check ports should fail on mock connection" do
+    @installer.check_ports
+    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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.8
 description: ''
 email:
 - foreman-dev+egon@googlegroups.com