egon 0.4.8 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGNhYmJkNjMxMWQ0ZWVlOWVjMTQxNDI5Y2ZiNWI2OTZlYWZjMjZlYQ==
+    NjY5YTQ1NjU5ZjNkZTU0Nzg3NzExMTQ5NjI5YzRmNzNmN2Y3OTYxNA==
   data.tar.gz: !binary |-
-    MGJjODRiZjVjYzE3ZGZhZDc4YWNkNTQzMGJlOGNjNjk1MzAwZTg3MQ==
+    YzM2MjEyMTI0ZmI1MDZkN2ZkZTliYmQ0Y2Q3NGQ0YjlkOGUxMjQzYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDE3ZjFiNjJlODMwM2ZlZmM4ZjdmMWY5ZWIxNjcyNjA0MmM0Mjc1ZDFjOTZh
-    MGY2NDllMjQ0NDE4YTY1ZDI1NzMwMjQxZDliMjEzZjQ2NWVmYTRhMDZhYzZh
-    ODdiZWQwNzI3NzFjYWYwOTliOTAyNTQ5NWFjYzM4MzdhYTBlNGI=
+    MWJmMjQyMmIwYjVlODY2MzNmMzk2ZDZlOGFhMTcxYjVkOTM0ODg1NDQwMjJl
+    OWRiNzBjOGZmNzdmNDVkZThiYmJhNmI3YWM2MWM3N2NiZjRmNDllOTEyMzk4
+    Mjc0Y2U0NGZhYmU2M2RlOTJkOWMzNGRmMzhiOTdiM2QwYWVkN2U=
   data.tar.gz: !binary |-
-    MDQwNGQ4Yjk1ZmUyNTBmNGI0ZjRjNTk3NTUxOTQ2NTBlODMwZGNhNzY2ODdh
-    MWE3MjM5MWUzZTVkYTc4NzdiNjVjODU0NmU0OTU1YmQzZjQyMGU1ZGJhMjRh
-    MTQ2NjE5NWU3ZjE3NzY4ZTdlYTI0ZWUwNjY5NzUwYWE5ZjczNTA=
+    MmYwODFlNzA0ZGUyNTQyNWQyY2JiNzcxNTNhMWYwMjYxZDFjN2ExZDY3ZTcy
+    OWEyMmMwYTM3YzEwMGRiM2I2MmYxYWM1YTQxZjg2Mjc2YmI4ZmQ1ODJlZmYy
+    ZDYyMWQ5MDJmZTgyNjI5Yjk1ZDJlMzIxODA0ZmE0MWYyZWJiODU=

data/Gemfile.lock

@@ -0,0 +1,144 @@
+PATH
+  remote: .
+  specs:
+    egon (0.4.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.3.1)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    excon (0.45.3)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.36.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.30)
+      fog-ecloud
+      fog-google (>= 0.0.2)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.4.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.30.0)
+      builder
+      excon (~> 0.45)
+      formatador (~> 0.2)
+      mime-types
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-ecloud (0.1.2)
+      fog-core
+      fog-xml
+    fog-google (0.0.5)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.3)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.4)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.0.1)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.6)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.7)
+  egon!
+  fog (~> 1.31.0)
+  net-ssh (~> 2.9.2)
+  rake (~> 10.0)
+  rspec (~> 3.2.0)

data/bin/initialize_overcloud.sh

@@ -1,17 +1,56 @@
 #!/bin/bash
 
+OVERCLOUD_NAME=${1:-overcloud}
+TEMPLATE_DIR=`mktemp -d`
+DEFAULT_PARAMETERS=overcloud-resource-registry-puppet.yaml
+USER_PARAMETERS=environments/deployment_parameters.yaml
+
 source /home/stack/stackrc
-source /home/stack/tripleo-overcloud-passwords
 
-KEYSTONE_IP=`heat output-show overcloud KeystoneAdminVip | tr -d '"'`
-PUBLIC_IP=`heat output-show overcloud PublicVip | tr -d '"'`
-OVERCLOUD_ENDPOINT=`heat output-show overcloud KeystoneURL`
-OVERCLOUD_IP=`python -c "from six.moves.urllib.parse import urlparse; print urlparse($OVERCLOUD_ENDPOINT).hostname"`
-OVERCLOUD_ENDPOINT=`echo $OVERCLOUD_ENDPOINT | tr -d '"'`
+cd $TEMPLATE_DIR
+swift download overcloud $DEFAULT_PARAMETERS
+swift download overcloud $USER_PARAMETERS
+
+function parameter_value_from_file {
+    PARAM=$1
+    FILE=$2
+    PARAM_GREP="^  ${PARAM}: "
+    PARAM_VALUE_UNPARSED=`grep "$PARAM_GREP" $FILE`
+    PARAM_VALUE=${PARAM_VALUE_UNPARSED#*:}
+    echo $PARAM_VALUE
+}
+
+function parameter_value {
+    PARAM=$1
+    PARAM_VALUE=`parameter_value_from_file $PARAM $TEMPLATE_DIR/$USER_PARAMETERS`
+
+    if [ -z "$PARAM_VALUE" ]; then
+	PARAM_VALUE=`parameter_value_from_file $PARAM $TEMPLATE_DIR/$DEFAULT_PARAMETERS`
+    fi
+
+    echo $PARAM_VALUE
+}
+
+KEYSTONE_IP=`heat output-show $OVERCLOUD_NAME KeystoneAdminVip | tr -d '"'`
+PUBLIC_IP=`heat output-show $OVERCLOUD_NAME PublicVip | tr -d '"'`
+KEYSTONE_URL=`heat output-show $OVERCLOUD_NAME KeystoneURL`
+OVERCLOUD_IP=`python -c "from six.moves.urllib.parse import urlparse; print urlparse($KEYSTONE_URL).hostname"`
+OVERCLOUD_ENDPOINT=`echo $KEYSTONE_URL | tr -d '"'`
 
 # set it to the same as overcloud_ip if empty
 [  -z "$KEYSTONE_IP" ] && KEYSTONE_IP=$OVERCLOUD_IP
 
+# get service passwords
+OVERCLOUD_ADMIN_PASSWORD=`parameter_value AdminPassword`
+OVERCLOUD_ADMIN_TOKEN=`parameter_value AdminToken`
+OVERCLOUD_CEILOMETER_PASSWORD=`parameter_value CeilometerPassword`
+OVERCLOUD_CINDER_PASSWORD=`parameter_value CinderPassword`
+OVERCLOUD_GLANCE_PASSWORD=`parameter_value GlancePassword`
+OVERCLOUD_HEAT_PASSWORD=`parameter_value HeatPassword`
+OVERCLOUD_NEUTRON_PASSWORD=`parameter_value NeutronPassword`
+OVERCLOUD_NOVA_PASSWORD=`parameter_value NovaPassword`
+OVERCLOUD_SWIFT_PASSWORD=`parameter_value SwiftPassword`
+
 # Write overcloudrc
 su - stack -c cat > /home/stack/overcloudrc << EOF
 export NOVA_VERSION=1.1
@@ -50,7 +89,6 @@ cat > $ENDPOINTS_FILE << EOF
     "heat":       {"password": "$OVERCLOUD_HEAT_PASSWORD"},
     "neutron":    {"password": "$OVERCLOUD_NEUTRON_PASSWORD"},
     "nova":       {"password": "$OVERCLOUD_NOVA_PASSWORD"},
-    "novav3":     {"password": "$OVERCLOUD_NOVA_PASSWORD"},
     "swift":      {"password": "$OVERCLOUD_SWIFT_PASSWORD"},
     "horizon": {
         "port": "80",
@@ -62,4 +100,7 @@ EOF
 
 # set up the endpoints
 setup-endpoints -s $ENDPOINTS_FILE -r regionOne
+
+# cleanup
 rm -f $ENDPOINTS_FILE
+rm -rf $TEMPLATE_DIR

data/bin/undercloud-install-local.rb

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

data/bin/undercloud-install-satellite.rb

@@ -15,7 +15,7 @@ SATELLITE_ACTIVATION_KEY = ARGV[5]
 
 connection = Egon::Undercloud::SSHConnection.new(SSH_HOST, SSH_USER, SSH_PASSWORD)
 installer = Egon::Undercloud::Installer.new(connection)
-installer.install(Egon::Undercloud::Commands.OSP7_satellite(SATELLITE_URL, SATELLITE_ORG, SATELLITE_ACTIVATION_KEY))
+installer.install(Egon::Undercloud::Commands.OSP8_satellite(SATELLITE_URL, SATELLITE_ORG, SATELLITE_ACTIVATION_KEY))
 while !installer.completed?
   sleep 1
 end  

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

@@ -13,7 +13,7 @@ RHSM_POOL_ID = ARGV[5]
 
 connection = Egon::Undercloud::SSHConnection.new(SSH_HOST, SSH_USER, SSH_PASSWORD)
 installer = Egon::Undercloud::Installer.new(connection)
-installer.install(Egon::Undercloud::Commands.OSP7_vanilla_rhel(RHSM_USER, RHSM_PASSWORD, RHSM_POOL_ID))
+installer.install(Egon::Undercloud::Commands.OSP8_vanilla_rhel(RHSM_USER, RHSM_PASSWORD, RHSM_POOL_ID))
 while !installer.completed?
   sleep 1
 end  

data/egon.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", "~> 1.7"
   s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "fog", "~> 1.31.0"
+  s.add_development_dependency "fog", "~> 1.36.0"
   s.add_development_dependency "net-ssh", "~> 2.9.2"
   s.add_development_dependency "rspec", "~> 3.2.0"
 end

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

@@ -1,81 +1,157 @@
 module Overcloud
   module Deployment
+
+    # BASE PLAN ACTIONS
+
+    def list_plans
+      uri = "#{base_tripleo_api_url}/plans"
+      response = Fog::Core::Connection.new(uri, false).request({
+            :expects => 200,
+            :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
+                         'X-Auth-Token' => auth_token},
+            :method  => 'GET'
+          })
+      body = Fog::JSON.decode(response.body)
+      body['plans']
+    end
  
     def get_plan(plan_name)
-      service('Planning').plans.find_by_name(plan_name)
+      uri = "#{base_tripleo_api_url}/plans/#{plan_name}"
+      response = Fog::Core::Connection.new(uri, false).request({
+            :expects => 200,
+            :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
+                         'X-Auth-Token' => auth_token},
+            :method  => 'GET'
+          })
+      body = Fog::JSON.decode(response.body)
+      body['plan']
+    end
+
+    def deploy_plan(plan_name)
+      plan = get_plan(plan_name)
+
+      # ensure that nodes are in correct state
+      for node in list_nodes
+        node.set_provision_state('provide') if node.provision_state == 'manageable'
+      end
+
+      uri = "#{base_tripleo_api_url}/plans/#{plan_name}/deploy"
+      response = Fog::Core::Connection.new(uri, false).request({
+            :expects => 202,
+            :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
+                         'X-Auth-Token' => auth_token},
+            :method  => 'PUT'
+          })
+    end
+
+    ## PLAN PARAMETER METHODS
+
+    def get_plan_parameters(plan_name)
+      uri = "#{base_tripleo_api_url}/plans/#{plan_name}/parameters"
+      response = Fog::Core::Connection.new(uri, false).request({
+            :expects => 200,
+            :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
+                         'X-Auth-Token' => auth_token},
+            :method  => 'GET',
+            :read_timeout => 360,
+          })
+      body = Fog::JSON.decode(response.body)
+      body['parameters']['Parameters']
     end
 
     def get_plan_parameter_value(plan_name, parameter_name)
-      params = get_plan(plan_name).parameters
-      param = params.find{|param| param["name"] == parameter_name }
-      if param
-        param["value"]
+      parameters = get_plan_parameters(plan_name)
+      if parameters.key?(parameter_name)
+        parameters[parameter_name]["Default"]
       else
         nil
       end
     end
 
     def edit_plan_parameters(plan_name, parameters)
-      get_plan(plan_name).patch(:parameters => parameters)
+      uri = "#{base_tripleo_api_url}/plans/#{plan_name}/parameters"
+      response = Fog::Core::Connection.new(uri, false).request({
+            :expects => 200,
+            :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
+                         'X-Auth-Token' => auth_token},
+            :method  => 'PATCH',
+            :body => Fog::JSON.encode(parameters),
+            :read_timeout => 360,
+            :write_timeout => 360,
+          })
     end
 
     def edit_plan_deployment_role_count(plan_name, role_name, count)
-      parameter = {"name" => role_name + "-1::count", "value" => count.to_s}
-      edit_plan_parameters(plan_name, [parameter])
+      parameters = {role_name + "Count" => count.to_s}
+      edit_plan_parameters(plan_name, parameters)
     end
 
-    def edit_plan_deployment_role_image(plan_name, role_name, image_uuid)
-      parameter = {"name" => role_name + "-1::Image", "value" => image_uuid}
-      edit_plan_parameters([parameter])
+    def edit_plan_deployment_role_flavor(plan_name, role_name, flavor_name)
+      if role_name == 'Controller'
+          flavor_parameter = 'OvercloudControlFlavor'
+      else
+          flavor_parameter = 'Overcloud' + role_name + 'Flavor'
+      end
+      parameters = {flavor_parameter => flavor_name}
+      edit_plan_parameters(plan_name, parameters)
     end
 
-    def edit_plan_deployment_role_flavor(plan_name, role_name, flavor_name)
-      parameter = {"name" => role_name + "-1::Flavor", "value" => flavor_name}
-      edit_plan_parameters(plan_name, [parameter])
+    ## PLAN ENVIRONMENT ACTIONS
+
+    def get_plan_environments(plan_name)
+      uri = "#{base_tripleo_api_url}/plans/#{plan_name}/environments"
+      response = Fog::Core::Connection.new(uri, false).request({
+            :expects => 200,
+            :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
+                         'X-Auth-Token' => auth_token},
+            :method  => 'GET',
+            :read_timeout => 360,
+          })
+      body = Fog::JSON.decode(response.body)
+      body['environments']
     end
 
-    def deploy_plan(plan_name)
-      plan = get_plan(plan_name)
+    def edit_plan_environments(plan_name, environments)
+      uri = "#{base_tripleo_api_url}/plans/#{plan_name}/environments"
+      response = Fog::Core::Connection.new(uri, false).request({
+            :expects => 200,
+            :headers => {'Content-Type' => 'application/json',
+                         'Accept' => 'application/json',
+                         'X-Auth-Token' => auth_token},
+            :method  => 'PATCH',
+            :body => Fog::JSON.encode(environments),
+            :read_timeout => 360,
+            :write_timeout => 360,
+          })
+    end
 
-      # ensure that nodes are in correct state
-      for node in list_nodes
-        node.set_provision_state('provide') if node.provision_state == 'manageable'
-      end
+    ## MISCELLANEOUS PLAN ACTIONS
 
-      # assign all unassigned roles; make sure their count is 0
-      default_flavor = list_flavors[0]
-      for role in list_deployment_roles
-        flavor_parameter_name = role.name + "-1::Flavor"
-        flavor_parameter_value = get_plan_parameter_value(plan_name, flavor_parameter_name)
-        if flavor_parameter_value.to_s == 'baremetal'
-          edit_plan_deployment_role_count(plan_name, role.name, 0)
-          edit_plan_deployment_role_flavor(plan_name, role.name, default_flavor.name)
-        end
-      end
+    def get_plan_deployment_roles(plan_name)
+      # temporarily hard-coded until API adds role function
+      return ['Controller', 'Compute', 'BlockStorage', 'ObjectStorage',
+              'CephStorage']
 
-      # temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1212740
-      templates = Hash[plan.provider_resource_templates]
-      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,
-        :template => plan.master_template,
-        :environment => plan.environment,
-        :files => templates,
-        :password => @password,
-        :timeout_mins => 60,
-        :disable_rollback => true
-      }
-      service('Orchestration').stacks.new.save(stack_parameters)
+      #uri = "#{base_tripleo_api_url}/plans/#{plan_name}/roles"
+      #response = Fog::Core::Connection.new(uri, false).request({
+      #      :expects => 200,
+      #      :headers => {'Content-Type' => 'application/json',
+      #                   'Accept' => 'application/json',
+      #                   'X-Auth-Token' => auth_token},
+      #      :method  => 'GET'
+      #    })
+      #body = Fog::JSON.decode(response.body)
+      #body['roles']
     end
 
+    ## HEAT ACTIONS
+
     def list_stacks
       service('Orchestration').stacks.all
     end
@@ -83,6 +159,16 @@ module Overcloud
     def get_stack_by_name(stack_name)
       list_stacks.find{|s| s.stack_name == stack_name}
     end
-  
+
+    def delete_stack(overcloud)
+      service('Orchestration').delete_stack(overcloud)
+    end
+
+    private
+    
+    def base_tripleo_api_url
+      return "http://#{@auth_url}:8585/v1"
+    end
+
   end
 end

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

@@ -9,6 +9,14 @@ module Overcloud
       service('Baremetal').nodes.details
     end
 
+    def list_ports
+      service('Baremetal').ports.all
+    end
+
+    def list_ports_detailed
+      service('Baremetal').ports.details
+    end
+
     def get_node(node_id)
       service('Baremetal').nodes.find_by_uuid(node_id)
     end
@@ -77,7 +85,22 @@ module Overcloud
     end
 
     def delete_node(node_id)
-      service('Baremetal').nodes.destroy(node_id)
+      begin
+        node = get_node(node_id)
+        if node.power_state == 'power on' && node.provision_state != 'active'
+          node.set_power_state('power off')
+          retries = 15
+          while retries > 0 && node.power_state != 'power off' do
+            sleep(2)
+            retries -= 1
+          end
+        end
+        service('Baremetal').nodes.destroy(node_id)
+      rescue Fog::Compute::OpenStack::NotFound => e
+        "Node Not Found"
+      rescue Excon::Errors::Conflict, Excon::Errors::BadRequest => e
+        JSON.parse(JSON.parse(e.response.body)["error_message"])["faultstring"].split("\n").first
+      end
     end
 
     ## THESE METHODS ARE TEMPORARY UNTIL IRONIC-DISCOVERD IS ADDED TO
@@ -85,7 +108,6 @@ module Overcloud
 
     def introspect_node(node_uuid)
       uri = "http://#{@auth_url}:5050/v1/introspection/#{node_uuid}"
-      auth_token = service('Baremetal').instance_variable_get(:@auth_token)
       response = Fog::Core::Connection.new(uri, false).request({
             :expects => 202,
             :headers => {'Content-Type' => 'application/json',
@@ -97,7 +119,6 @@ module Overcloud
 
     def introspect_node_status(node_uuid)
       uri = "http://#{@auth_url}:5050/v1/introspection/#{node_uuid}"
-      auth_token = service('Baremetal').instance_variable_get(:@auth_token)
       response = Fog::Core::Connection.new(uri, false).request({
             :expects => 200,
             :headers => {'Content-Type' => 'application/json',

data/lib/egon/overcloud/undercloud_handle.rb

@@ -1,6 +1,5 @@
 require 'fog'
 require_relative 'undercloud_handle/deployment'
-require_relative 'undercloud_handle/deployment_role'
 require_relative 'undercloud_handle/flavor'
 require_relative 'undercloud_handle/image'
 require_relative 'undercloud_handle/node'
@@ -9,7 +8,6 @@ module Overcloud
   class UndercloudHandle
 
     include Overcloud::Deployment
-    include Overcloud::DeploymentRole
     include Overcloud::Flavor
     include Overcloud::Image
     include Overcloud::Node
@@ -37,6 +35,10 @@ module Overcloud
       end
       return Fog.const_get(service_name).new(fog_parameters)
     end
-  
+
+    def auth_token
+      service('Baremetal').instance_variable_get(:@auth_token)
+    end
+
   end
 end

data/lib/egon/undercloud/commands.rb

@@ -3,12 +3,14 @@ module Egon
   module Undercloud
     class Commands
 
+      ## OSP7
+
       def self.OSP7_satellite(satellite_url, org, activation_key)
         return "
         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}\"
-        #{self.OSP7_COMMON_no_registration}"
+        #{self.OSP7_no_registration}"
       end
     
       def self.OSP7_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)
@@ -34,7 +36,7 @@ module Egon
         return OSP7_COMMON
       end
 
-      POST_INSTALL = "
+      POST_INSTALL_7 = "
       source ~/stackrc
       source ~/tripleo-undercloud-passwords
 
@@ -235,7 +237,109 @@ module Egon
       sudo chown $USER: ~/tripleo-undercloud-passwords
       sudo cp /root/stackrc ~
       sudo chown $USER: ~/stackrc
-      #{POST_INSTALL}"
+      #{POST_INSTALL_7}"
+
+      ## OSP8
+
+      def self.OSP8_satellite(satellite_url, org, activation_key)
+        return "
+        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}\"
+        #{self.OSP8_no_registration}"
+      end
+    
+      def self.OSP8_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)
+        return "
+        sudo subscription-manager register --force --username=\"#{rhsm_user}\" --password=\"#{rhsm_password}\"
+        sudo subscription-manager attach --pool=\"#{rhsm_pool_id}\"
+        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
+        #{self.OSP8_no_registration}"
+      end
+    
+      def self.OSP8_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;
+          sed -i -- 's/#store_events = false/store_events = true/g' ~/undercloud.conf
+        fi
+        #{self.OSP8_no_registration_no_packages}"
+      end
+
+      def self.OSP8_no_registration_no_packages
+        return OSP8_COMMON
+      end
+
+      POST_INSTALL_8 = "
+      sudo setenforce permissive
+      source ~/stackrc
+
+      sudo yum install -y rhosp-director-images
+      cd /usr/share/rhosp-director-images
+      sudo tar xf ironic-python-agent.tar
+      sudo tar xf overcloud-full.tar
+      openstack overcloud image upload
+      cd ~
+
+      SUBNET_ID=$(neutron subnet-show ''  | awk '$2==\"id\" {print $4}')
+      neutron subnet-update $SUBNET_ID --dns-nameserver 192.168.122.1
+
+      OS_AUTH_URL_ESC=$(sed 's/\\\//\\\\\\//g' <<<\"$OS_AUTH_URL\")
+      sudo yum install -y openstack-tripleo-api
+      sudo sed -i -- \"s/#auth_strategy = keystone/auth_strategy = noauth/g\" /etc/tripleo/tripleo.conf
+      sudo sed -i -- \"s/#password = <None>/password = $OS_PASSWORD/g\" /etc/tripleo/tripleo.conf
+      sudo sed -i -- \"s/#auth_url = http:\\/\\/localhost:35357\\/v2.0/auth_url = $OS_AUTH_URL_ESC/g\" /etc/tripleo/tripleo.conf
+      sudo sed -i -- \"s/#identity_uri = <None>/identity_uri = $OS_AUTH_URL_ESC/g\" /etc/tripleo/tripleo.conf
+      sudo sed -i -- \"s/#admin_user = <None>/admin_user = admin/g\" /etc/tripleo/tripleo.conf
+      sudo sed -i -- \"s/#admin_password = <None>/admin_password = $OS_PASSWORD/g\" /etc/tripleo/tripleo.conf
+      sudo service openstack-tripleo-api restart
+      sudo systemctl enable openstack-tripleo-api
+      sudo sed -i -- \"s/max_json_body_size = 1048576/max_json_body_size = 2000000/g\" /etc/heat/heat.conf
+      sudo service openstack-heat-api restart
+      sudo service openstack-heat-api-cfn restart
+      sudo service openstack-heat-engine restart
+
+      if ! [ $(swift list | grep overcloud) ]; then
+
+        cp -r /usr/share/openstack-tripleo-heat-templates .
+        cp /usr/share/tripleo-api/templates/capabilities-map.yaml openstack-tripleo-heat-templates/.
+
+        echo '  BlockStorageImage: overcloud-full' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  CephStorageImage: overcloud-full' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  SwiftStorageImage: overcloud-full' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  controllerImage: overcloud-full' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  NovaImage: overcloud-full' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  CinderPassword: Ma3kfBHqB8FDb2hgJa3sPUAzh' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  GlancePassword: EBNnAsWxuzAHfqG8trjjMDsCu' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  SwiftPassword: KfqyTxGtQ9y7P6yCK2m7n2xMz' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  NeutronMetadataProxySharedSecret: A2kEkckqfAzxcdVEJtnWj4hGP' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  HeatPassword: BEhHu9UhKd4ZnQwmtCUFsZrh4' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  HeatStackDomainAdminPassword: fpRbkRneNJVutk4QqK8xYR3Qm' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  NeutronPassword: 9n3AfD2b9zfBrmmBHwHyc7TgV' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  AdminToken: CuVyGZqfwZdbTwUaX9euaPGaA' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  SwiftHashSuffix: JN273288Xt3JTBqnE8RBsrYze' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  CeilometerMeteringSecret: Hvkf9Rzz6tHF6UVsErPjCE3uM' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  SnmpdReadonlyUserPassword: password' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  CeilometerPassword: 2zgV6yAE2d3JTskTnBUsvzDf4' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  NovaPassword: QCn7EHTkMMrJHH7Upp6txzUYX' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  RedisPassword: Rhq8Fd7eEIoPP821Ui' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  HAProxyStatsPassword: veLYjyhxgs7GtQuKXF' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+
+        echo 'parameter_defaults:' >> openstack-tripleo-heat-templates/environments/deployment_parameters.yaml
+        echo '  AdminPassword: changeme' >> openstack-tripleo-heat-templates/environments/deployment_parameters.yaml
+
+        sudo tripleo-plan-create --config-file /etc/tripleo/tripleo.conf
+      fi
+      "
+
+      OSP8_COMMON = "
+      sudo sed -i '$ a\net.ipv4.ip_forward = 1' /etc/sysctl.conf
+      sudo sysctl -p /etc/sysctl.conf
+      openstack undercloud install
+      #{POST_INSTALL_8}"
 
     end
   end  

data/lib/egon/undercloud/installer.rb

@@ -54,6 +54,9 @@ module Egon
 
       def check_ports(stringio=nil)
         # closed ports 5385, 36357
+        address = File.foreach('/home/stack/undercloud.conf')
+                      .grep(/^local_ip/).first
+                      .match(/(?:[0-9]{1,3}\.){3}[0-9]{1,3}/).to_s
         ports = [8774, 9292, 8777, 9696, 8004, 5000, 8585, 15672]
         ports.each do |p|
           if !@connection.nil?
@@ -63,7 +66,7 @@ module Egon
             end
           else
             # local check
-            set_failure(true) unless !port_open?("192.0.2.1", p, stringio)
+            set_failure(true) unless !port_open?(address, p, stringio)
           end
         end
       end

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.4.8"
+  VERSION = "1.0.0"
 end

data/rubygem-egon.spec

@@ -4,8 +4,8 @@
 %global gem_name egon
 
 Name: %{?scl_prefix}rubygem-%{gem_name}
-Version: 0.4.2
-Release: 7%{?dist}
+Version: 1.0.0
+Release: 0%{?dist}
 Summary: A library on top of Fog that encapsulates TripleO deployment operations
 Group: Development/Languages
 License: GPL-3.0+
@@ -13,7 +13,7 @@ URL: https://github.com/fusor/egon
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 BuildRequires: %{?scl_prefix}rubygems-devel
 Requires: %{?scl_prefix}ruby
-Requires: %{?scl_prefix}rubygem(fog) => 1.31.0
+Requires: %{?scl_prefix}rubygem(fog) => 1.36.0
 Requires: %{?scl_prefix}rubygem(net-ssh) => 2.9.2
 Requires: %{?scl_prefix}rubygem(net-ssh) < 2.10
 BuildArch: noarch
@@ -93,6 +93,9 @@ popd
 %{gem_instdir}/test
 
 %changelog
+* Thu Oct 29 2015 Jason Rist <jrist@redhat.com> 0.4.8
+- bump fog requirement to 1.36.0 to fix uuid bug (jrist@redhat.com)
+
 * Thu Sep 10 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-7
 - gempsec and rpm spec cleanup (jmontleo@redhat.com)
 

data/test/test_undercloud_handle.rb

@@ -1,10 +1,8 @@
 require 'fog'
 require 'fog/openstack/models/baremetal/nodes'
 require 'fog/openstack/models/compute/flavors'
-require 'fog/openstack/models/image/image'
+require 'fog/openstack/models/image_v1/image'
 require 'fog/openstack/models/orchestration/stacks'
-require 'fog/openstack/models/planning/plans'
-require 'fog/openstack/models/planning/role'
 require './lib/egon/overcloud/undercloud_handle'
 
 describe "overcloud installation mocked" do
@@ -18,12 +16,12 @@ describe "overcloud installation mocked" do
       @undercloud_handle = Overcloud::UndercloudHandle.new(options[:openstack_username], 'xxxxxxx', options[:openstack_auth_url])
 
       # setup for mock image service
-      image_service = Fog::Image::OpenStack::Mock.new(options)
-      bm_deploy_kernel_image = Fog::Image::OpenStack::Image.new({
+      image_service = Fog::Image::OpenStack::V1::Mock.new(options)
+      bm_deploy_kernel_image = Fog::Image::OpenStack::V1::Image.new({
         :id => '1',
         :name => 'bm-deploy-kernel'
       })
-      bm_deploy_ramdisk_image = Fog::Image::OpenStack::Image.new({
+      bm_deploy_ramdisk_image = Fog::Image::OpenStack::V1::Image.new({
         :id => '2',
         :name => 'bm-deploy-ramdisk'
       })
@@ -71,34 +69,14 @@ describe "overcloud installation mocked" do
       allow(compute_service).to receive(:flavors).and_return(flavors)
       allow(@undercloud_handle).to receive(:service).with('Compute').and_return(compute_service)
 
-      # setup for mock planning service
-      planning_service = Fog::Openstack::Planning::Mock.new(options)
-      plans = Fog::Openstack::Planning::Plans.new
-      overcloud_plan = Fog::Openstack::Planning::Plan.new({
-        :uuid => '1',
-        :name => 'overcloud'
-      })
-      compute_role = Fog::Openstack::Planning::Role.new({
-        :uuid => '1',
-        :name => 'Compute'
-      })
-      controller_role = Fog::Openstack::Planning::Role.new({
-        :uuid => '1',
-        :name => 'Controller'
-      })
-      allow(planning_service).to receive(:roles).and_return([compute_role, controller_role])
-      allow(planning_service).to receive(:plans).and_return(plans)
-      allow(plans).to receive(:find_by_name).and_return(overcloud_plan)
-      allow(@undercloud_handle).to receive(:service).with('Planning').and_return(planning_service)
-
       # setup for mock orchestration service
       orchestration_service = Fog::Orchestration::OpenStack::Mock.new(options)
       stacks = Fog::Orchestration::OpenStack::Stacks.new
       overcloud_stack = Fog::Orchestration::OpenStack::Stack.new({
         'id' => '1',
-        'name' => 'overcloud',
+        'stack_name' => 'overcloud',
       })
-      allow(stacks).to receive(:get).and_return(overcloud_stack)
+      allow(stacks).to receive(:all).and_return([overcloud_stack])
       allow(orchestration_service).to receive(:stacks).and_return(stacks)
       allow(@undercloud_handle).to receive(:service).with('Orchestration').and_return(orchestration_service)
     end
@@ -164,16 +142,8 @@ describe "overcloud installation mocked" do
       expect(@undercloud_handle.list_nodes.length).to eq 2
     end
 
-    it "should be able to list_deployment_roles" do
-      expect(@undercloud_handle.list_deployment_roles.length).to eq 2
-    end
-
-    it "should be able to get_plan" do
-      expect(@undercloud_handle.get_plan('overcloud').uuid).to eq '1'
-    end
-
     it "should be able to get_stack" do
-      expect(@undercloud_handle.get_stack('overcloud').id).to eq '1'
+      expect(@undercloud_handle.get_stack_by_name('overcloud').id).to eq '1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -103,7 +104,6 @@ files:
 - lib/egon.rb
 - lib/egon/overcloud/undercloud_handle.rb
 - lib/egon/overcloud/undercloud_handle/deployment.rb
-- lib/egon/overcloud/undercloud_handle/deployment_role.rb
 - lib/egon/overcloud/undercloud_handle/flavor.rb
 - lib/egon/overcloud/undercloud_handle/image.rb
 - lib/egon/overcloud/undercloud_handle/node.rb
@@ -112,21 +112,10 @@ files:
 - lib/egon/undercloud/port-check-mixin.rb
 - lib/egon/undercloud/ssh-connection.rb
 - lib/egon/version.rb
+- pkg/egon-0.0.1.gem
+- pkg/egon-0.0.2.gem
 - pkg/egon-0.1.0.gem
-- pkg/egon-0.2.0.gem
-- pkg/egon-0.3.1.gem
-- pkg/egon-0.3.2.gem
-- pkg/egon-0.3.3.gem
-- pkg/egon-0.3.4.gem
-- pkg/egon-0.3.5.gem
-- pkg/egon-0.3.6.gem
-- pkg/egon-0.4.0.gem
-- pkg/egon-0.4.1.gem
-- pkg/egon-0.4.2.gem
-- pkg/egon-0.4.4.gem
-- pkg/egon-0.4.5.gem
-- pkg/egon-0.4.6.gem
-- pkg/egon-0.4.7.gem
+- pkg/egon-0.4.3.gem
 - rubygem-egon.spec
 - test/test_ssh_connection.rb
 - test/test_undercloud.rb

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

@@ -1,9 +0,0 @@
-module Overcloud
-  module DeploymentRole
-
-    def list_deployment_roles
-      service('Planning').roles
-    end
-
-  end
-end