egon 1.0.0 → 1.1.0

data/bin/undercloud-install-local.rb

@@ -3,5 +3,9 @@ require 'egon/undercloud/commands'
 require 'egon/undercloud/installer'
 
 installer = Egon::Undercloud::Installer.new
-installer.install(Egon::Undercloud::Commands.OSP8_no_registration)
-installer.check_ports
+installer.install(Egon::Undercloud::Commands.OSP10_no_registration)
+if installer.failure?
+  exit 1
+else
+  installer.check_ports
+end

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.OSP8_satellite(SATELLITE_URL, SATELLITE_ORG, SATELLITE_ACTIVATION_KEY))
+installer.install(Egon::Undercloud::Commands.OSP10_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.OSP8_vanilla_rhel(RHSM_USER, RHSM_PASSWORD, RHSM_POOL_ID))
+installer.install(Egon::Undercloud::Commands.OSP10_vanilla_rhel(RHSM_USER, RHSM_PASSWORD, RHSM_POOL_ID))
 while !installer.completed?
   sleep 1
 end  

data/lib/egon/overcloud/undercloud_handle.rb

@@ -1,4 +1,5 @@
-require 'fog'
+require 'fog/openstack'
+require 'json'
 require_relative 'undercloud_handle/deployment'
 require_relative 'undercloud_handle/flavor'
 require_relative 'undercloud_handle/image'
@@ -18,7 +19,31 @@ module Overcloud
       @auth_url = auth_url
       @port = port
     end
-    
+
+    def execute_workflow(workflow, input, wait_for_complete = true)
+      connection = service('Workflow')
+      response = connection.create_execution(workflow, input)
+      state = response.body['state']
+      workflow_execution_id = response.body['id']
+
+      return unless wait_for_complete
+
+      while state == 'RUNNING'
+        sleep 2
+        response = connection.get_execution(workflow_execution_id)
+        state = response.body['state']
+      end
+
+      if state != 'SUCCESS'
+        raise "Executing workflow #{workflow} on #{input} failed: #{response.body['output']}"
+      end
+      workflow_execution_id
+    end
+
+    def workflow_action_execution(action_name, params = {})
+      return JSON.parse(service('Workflow').create_action_execution(action_name, params).body["output"])["result"]
+    end
+
     private
     
     def service(service_name)
@@ -32,6 +57,8 @@ module Overcloud
       
       if service_name == 'Planning'
         return Fog::Openstack.const_get(service_name).new(fog_parameters)
+      elsif service_name == 'Workflow'
+        return Fog::Workflow::OpenStack.new(fog_parameters)
       end
       return Fog.const_get(service_name).new(fog_parameters)
     end

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

@@ -4,63 +4,30 @@ module Overcloud
     # 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']
+      return workflow_action_execution('tripleo.plan.list')
     end
  
     def get_plan(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']
+      # this doesn't exist anymore?
+      return {'name' => plan_name}
     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'
-          })
+      workflow = 'tripleo.deployment.v1.deploy_plan'
+      input = { container: plan_name }
+      execute_workflow(workflow, input, false)
     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']
+      all_params = workflow_action_execution('tripleo.parameters.get', { :container => plan_name })
+      return flatten_parameters(all_params["heat_resource_tree"])
     end
 
     def get_plan_parameter_value(plan_name, parameter_name)
@@ -73,17 +40,11 @@ module Overcloud
     end
 
     def edit_plan_parameters(plan_name, 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,
-          })
+      action_parameters = {
+        :container => plan_name,
+        :parameters => parameters
+      }
+      workflow_action_execution('tripleo.parameters.update', action_parameters)
     end
 
     def edit_plan_deployment_role_count(plan_name, role_name, count)
@@ -104,50 +65,21 @@ module Overcloud
     ## 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']
+      return workflow_action_execution('tripleo.heat_capabilities.get', { :container => plan_name })
     end
 
     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,
-          })
+      action_parameters = {
+        :container => plan_name,
+        :environments => environments
+      }
+      workflow_action_execution('tripleo.heat_capabilities.update', action_parameters)
     end
 
     ## MISCELLANEOUS PLAN ACTIONS
 
     def get_plan_deployment_roles(plan_name)
-      # temporarily hard-coded until API adds role function
-      return ['Controller', 'Compute', 'BlockStorage', 'ObjectStorage',
-              'CephStorage']
-
-      #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']
+      return workflow_action_execution('tripleo.role.list', { :container => plan_name })
     end
 
     ## HEAT ACTIONS
@@ -166,8 +98,17 @@ module Overcloud
 
     private
     
-    def base_tripleo_api_url
-      return "http://#{@auth_url}:8585/v1"
+    def flatten_parameters(base_parameters)
+      flat_parameters = {}
+      if base_parameters.key?('Parameters')
+        flat_parameters.merge!base_parameters['Parameters']
+      end
+      if base_parameters.key?('NestedParameters')
+        for nested_parameters in base_parameters['NestedParameters']
+          flat_parameters.merge!(flatten_parameters(nested_parameters[1]))
+        end
+      end
+      flat_parameters
     end
 
   end

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

@@ -20,7 +20,7 @@ module Overcloud
     def get_node(node_id)
       service('Baremetal').nodes.find_by_uuid(node_id)
     end
-    
+
     def create_node(node_parameters)
       node = create_node_only(node_parameters)
       introspect_node(node.uuid)
@@ -28,11 +28,24 @@ module Overcloud
     end
 
     def create_node_only(node_parameters)
-      node = service('Baremetal').nodes.create(node_parameters)
-      create_port({:node_uuid => node.uuid, :address => node_parameters[:address]})
+      workflow = 'tripleo.baremetal.v1.register_or_update'
+      json = node_parameters_to_json(node_parameters)
+      input = { nodes_json: json }
+      workflow_execution_id = execute_workflow(workflow, input)
 
-      node.set_provision_state('manage')
-      node
+      connection = service('Workflow')
+      output = connection.get_execution(workflow_execution_id).body['output']
+      output_json = JSON.parse(output)
+      node_uuid = output_json['registered_nodes'].first['uuid']
+
+      configure_node(node_uuid)
+      get_node(node_uuid)
+    end
+
+    def configure_node(node_uuid)
+      workflow = 'tripleo.baremetal.v1.configure'
+      input = { node_uuids: [node_uuid] }
+      execute_workflow(workflow, input)
     end
 
     def create_port(port_parameters)
@@ -48,10 +61,13 @@ module Overcloud
         driver = node_data[4]
         mac_address = node_data[8]
         if driver == 'pxe_ssh'
+          ssh_key_contents = node_data[7]
+          # CSV processing appends an extra '\', we need to remove it
+          ssh_key_contents.gsub!("\\n", "\n")
           driver_info = {
             :ssh_address => node_data[5],
             :ssh_username => node_data[6],
-            :ssh_key_contents => node_data[7],
+            :ssh_key_contents => ssh_key_contents,
             :ssh_virt_type => 'virsh',
             :deploy_kernel => get_baremetal_deploy_kernel_image.id,
             :deploy_ramdisk => get_baremetal_deploy_ramdisk_image.id
@@ -84,6 +100,33 @@ module Overcloud
       end
     end
 
+    def node_parameters_to_json(node_parameters)
+      json = {
+        'disk' => node_parameters[:properties][:local_gb],
+        'cpu' => node_parameters[:properties][:cpus],
+        'memory' => node_parameters[:properties][:memory_mb],
+        'arch' => node_parameters[:properties][:cpu_arch],
+        'mac' => [node_parameters[:address]],
+        'pm_type' => node_parameters[:driver]
+      }
+      if node_parameters[:driver] == 'pxe_ssh'
+        json['pm_user'] = node_parameters[:driver_info][:ssh_username]
+        if node_parameters[:driver_info][:ssh_password]
+          json['pm_password'] = node_parameters[:driver_info][:ssh_password]
+        elsif node_parameters[:driver_info][:ssh_key_contents]
+          json['pm_password'] = node_parameters[:driver_info][:ssh_key_contents]
+        end
+        json['pm_addr'] = node_parameters[:driver_info][:ssh_address]
+      elsif node_parameters[:driver] == 'pxe_ipmitool'
+        json['pm_user'] = node_parameters[:driver_info][:ipmi_username]
+        json['pm_password'] = node_parameters[:driver_info][:ipmi_password]
+        json['pm_addr'] = node_parameters[:driver_info][:ipmi_address]
+      else
+        raise "Unknown node driver: #{node_parameters[:driver]}"
+      end
+      [json]
+    end
+
     def delete_node(node_id)
       begin
         node = get_node(node_id)
@@ -107,14 +150,9 @@ module Overcloud
     ## OPENSTACK AND KEYSTONE
 
     def introspect_node(node_uuid)
-      uri = "http://#{@auth_url}:5050/v1/introspection/#{node_uuid}"
-      response = Fog::Core::Connection.new(uri, false).request({
-            :expects => 202,
-            :headers => {'Content-Type' => 'application/json',
-                         'Accept' => 'application/json',
-                         'X-Auth-Token' => auth_token},
-            :method  => 'POST'
-          })      
+      workflow = 'tripleo.baremetal.v1.introspect'
+      input = { node_uuids: [node_uuid] }
+      execute_workflow(workflow, input, false)
     end
 
     def introspect_node_status(node_uuid)

data/lib/egon/undercloud/commands.rb

@@ -1,25 +1,37 @@
+require 'securerandom'
 
 module Egon
   module Undercloud
     class Commands
 
-      ## OSP7
-
-      def self.OSP7_satellite(satellite_url, org, activation_key)
+      ## OSP Common
+      def self.OSP_common_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_no_registration}"
+        sudo subscription-manager register --org=\"#{org}\" --activationkey=\"#{activation_key}\""
       end
-    
-      def self.OSP7_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)
+
+      def self.OSP_common_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
+         --enable=rhel-7-server-openstack-6.0-rpms"
+      end
+
+      ## OSP7
+
+      def self.OSP7_satellite(satellite_url, org, activation_key)
+        return "
+        #{self.OSP_common_satellite(satellite_url, org, activation_key)}
+        #{self.OSP7_no_registration}"
+      end
+    
+      def self.OSP7_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)
+        return "
+        #{self.OSP_common_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)}
         #{self.OSP7_no_registration}"
       end
     
@@ -243,25 +255,18 @@ module Egon
 
       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.OSP_common_satellite(satellite_url, org, 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.OSP_common_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)}
         #{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
@@ -274,7 +279,7 @@ module Egon
       end
 
       POST_INSTALL_8 = "
-      sudo setenforce permissive
+      sudo setenforce enforcing
       source ~/stackrc
 
       sudo yum install -y rhosp-director-images
@@ -297,50 +302,212 @@ module Egon
       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
 
+      sudo sed -i -- \"s/scheduler_use_baremetal_filters=False/scheduler_use_baremetal_filters=True/g\" /etc/nova/nova.conf
+      sudo sed -i -- \"s/#baremetal_scheduler_default_filters/baremetal_scheduler_default_filters/g\" /etc/nova/nova.conf
+      sudo service openstack-nova-scheduler restart
+
+      retries=5
+
+      # Temporarily deal with BZ#1319795
+      retry_count=0
+      while ! systemctl is-active openstack-swift-* --all >/dev/null && (( retry_count < retries )); do
+        echo \"Swift services not started, retrying.\"
+        let retry_count+=1; sudo openstack-service restart swift; sleep 60;
+      done
+
+      # Swift is not always immediately responsive
+      retry_count=0
+      while ! swift stat 2>/dev/null && (( $retry_count < $retries )); do
+        echo \"Swift is not ready. Sleeping for 30 seconds.\";
+        let retry_count+=1; sleep 30;
+      done
+
+      if ! swift stat 2>/dev/null; then
+        echo \"Swift did not start properly. Please fix the problem before trying again\"
+        exit 1
+      fi
+
       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/.
+        cat << 'EOF' >> openstack-tripleo-heat-templates/capabilities-map.yaml
+  - title: TLS
+    description:
+    environment_groups:
+      - title: TLS
+        description: >
+          Enable TLS
+        environments:
+          - file: environments/enable-tls.yaml
+            title: Enable TLS
+            description:
+            requires:
+              - ../puppet/extraconfig/tls/tls-cert-inject.yaml
+          - file: environments/inject-trust-anchor.yaml
+            title: Inject CA
+            description:
+            requires:
+              - ../puppet/extraconfig/tls/tls-cert-inject.yaml
+
+  - title: Registration
+    description:
+    environment_groups:
+      - title: Registration
+        description: >
+          Register the Overcloud to CDN or Satellite
+        environments:
+          - file: environments/rhel-registration.yaml
+            title: RHEL Registration
+            description:
+            requires:
+              - extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml
+EOF
+
+        cat openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml > openstack-tripleo-heat-templates/environments/rhel-registration.yaml
+        cat openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml >> openstack-tripleo-heat-templates/environments/rhel-registration.yaml
+        sed -i 's,rhel-registration.yaml,../extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml,g' openstack-tripleo-heat-templates/environments/rhel-registration.yaml
 
         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 '  CinderPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  GlancePassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  SwiftPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  NeutronMetadataProxySharedSecret: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  HeatPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  HeatStackDomainAdminPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  NeutronPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  AdminToken: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  SwiftHashSuffix: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  CeilometerMeteringSecret: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  SnmpdReadonlyUserPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  CeilometerPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  NovaPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  RedisPassword: #{SecureRandom.hex}' >> openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml
+        echo '  HAProxyStatsPassword: #{SecureRandom.hex}' >> 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
+
+        pushd openstack-tripleo-heat-templates
+        swift upload overcloud extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration extraconfig/pre_deploy/rhel-registration/scripts/rhel-unregistration
+        popd
       fi
       "
 
       OSP8_COMMON = "
-      sudo sed -i '$ a\net.ipv4.ip_forward = 1' /etc/sysctl.conf
+      sudo sed -i '/^net.ipv4.ip_forward =/{h;s/=.*/= 1/};${x;/^$/{s//net.ipv4.ip_forward = 1/;H};x}' /etc/sysctl.conf
       sudo sysctl -p /etc/sysctl.conf
       openstack undercloud install
       #{POST_INSTALL_8}"
 
+      ## OSP10
+
+      def self.OSP10_satellite(satellite_url, org, activation_key)
+        return "
+        #{self.OSP_common_satellite(satellite_url, org, activation_key)}
+        #{self.OSP10_no_registration}"
+      end
+    
+      def self.OSP10_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)
+        return "
+        #{self.OSP_common_vanilla_rhel(rhsm_user, rhsm_password, rhsm_pool_id)}
+        #{self.OSP10_no_registration}"
+      end
+    
+      def self.OSP10_no_registration
+        return "
+        if [ ! -f ~/undercloud.conf ]; then
+          cp -f /usr/share/instack-undercloud/undercloud.conf.sample ~/undercloud.conf;
+        fi
+        sed -i -- 's/#store_events = false/store_events = true/g' ~/undercloud.conf
+        sed -i -- 's/#enable_telemetry = false/enable_telemetry = true/g' ~/undercloud.conf
+        #{self.OSP10_no_registration_no_packages}"
+      end
+
+      def self.OSP10_no_registration_no_packages
+        return OSP10_COMMON
+      end
+
+      POST_INSTALL_10 = "
+      sudo setenforce enforcing
+      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
+
+      openstack action execution run tripleo.plan.delete '{\"container\": \"overcloud\"}'
+
+      cp -r /usr/share/openstack-tripleo-heat-templates .
+      cat << 'EOF' >> openstack-tripleo-heat-templates/capabilities-map.yaml
+
+  - title: TLS
+    description:
+    environment_groups:
+      - title: TLS
+        description: >
+          Enable TLS
+        environments:
+          - file: environments/enable-tls.yaml
+            title: Enable TLS
+            description:
+            requires:
+              - ../puppet/extraconfig/tls/tls-cert-inject.yaml
+          - file: environments/inject-trust-anchor.yaml
+            title: Inject CA
+            description:
+            requires:
+              - ../puppet/extraconfig/tls/tls-cert-inject.yaml
+
+  - title: Registration
+    description:
+    environment_groups:
+      - title: Registration
+        description: >
+          Register the Overcloud to CDN or Satellite
+        environments:
+          - file: environments/rhel-registration.yaml
+            title: RHEL Registration
+            description:
+            requires:
+              - extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml
+EOF
+
+      cat openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/rhel-registration-resource-registry.yaml > openstack-tripleo-heat-templates/environments/rhel-registration.yaml
+      cat openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/environment-rhel-registration.yaml >> openstack-tripleo-heat-templates/environments/rhel-registration.yaml
+      sed -i 's,rhel-registration.yaml,../extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml,g' openstack-tripleo-heat-templates/environments/rhel-registration.yaml
+      sed -i 's,            rpm -Uvh katello-ca-consumer-latest.noarch.rpm || true,            rpm -Uvh katello-ca-consumer-latest.noarch.rpm || true\\n            echo \"\{\"network.hostname\":\"$HOSTNAME\"\}\" > /etc/rhsm/facts/katello.facts,' openstack-tripleo-heat-templates/extraconfig/pre_deploy/rhel-registration/scripts/rhel-registration
+
+      openstack action execution run tripleo.plan.create_container '{\"container\": \"overcloud\"}'
+      cd openstack-tripleo-heat-templates
+      swift upload overcloud *
+      cd ..
+      openstack workflow execution create tripleo.plan_management.v1.create_deployment_plan '{\"container\": \"overcloud\"}'
+      "
+
+      OSP10_COMMON = "
+      sudo sed -i '/^net.ipv4.ip_forward =/{h;s/=.*/= 1/};${x;/^$/{s//net.ipv4.ip_forward = 1/;H};x}' /etc/sysctl.conf
+      sudo sysctl -p /etc/sysctl.conf
+      openstack undercloud install
+      #{POST_INSTALL_10}"
     end
   end  
 end

data/lib/egon/version.rb

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

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,27 +38,47 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.43.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.43.0
+- !ruby/object:Gem::Dependency
+  name: fog-openstack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.15
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,23 +111,13 @@ description: ''
 email:
 - foreman-dev+egon@googlegroups.com
 executables:
-- undercloud-install-satellite.rb
 - initialize_overcloud.sh
-- undercloud-install-vanilla-rhel.rb
 - undercloud-install-local.rb
+- undercloud-install-satellite.rb
+- undercloud-install-vanilla-rhel.rb
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- Rakefile
-- bin/initialize_overcloud.sh
-- bin/undercloud-install-local.rb
-- bin/undercloud-install-satellite.rb
-- bin/undercloud-install-vanilla-rhel.rb
-- egon.gemspec
 - lib/egon.rb
 - lib/egon/overcloud/undercloud_handle.rb
 - lib/egon/overcloud/undercloud_handle/deployment.rb
@@ -112,39 +129,42 @@ 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.4.3.gem
-- rubygem-egon.spec
+- LICENSE
+- Rakefile
+- README.md
 - test/test_ssh_connection.rb
 - test/test_undercloud.rb
 - test/test_undercloud_handle.rb
+- bin/initialize_overcloud.sh
+- bin/undercloud-install-local.rb
+- bin/undercloud-install-satellite.rb
+- bin/undercloud-install-vanilla-rhel.rb
 homepage: https://github.com/fusor/egon
 licenses:
 - GPL-3.0+
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A library on top of Fog that encapsulates TripleO deployment operations
 test_files:
-- test/test_undercloud_handle.rb
-- test/test_undercloud.rb
 - test/test_ssh_connection.rb
+- test/test_undercloud.rb
+- test/test_undercloud_handle.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjY5YTQ1NjU5ZjNkZTU0Nzg3NzExMTQ5NjI5YzRmNzNmN2Y3OTYxNA==
-  data.tar.gz: !binary |-
-    YzM2MjEyMTI0ZmI1MDZkN2ZkZTliYmQ0Y2Q3NGQ0YjlkOGUxMjQzYQ==
-SHA512:
-  metadata.gz: !binary |-
-    MWJmMjQyMmIwYjVlODY2MzNmMzk2ZDZlOGFhMTcxYjVkOTM0ODg1NDQwMjJl
-    OWRiNzBjOGZmNzdmNDVkZThiYmJhNmI3YWM2MWM3N2NiZjRmNDllOTEyMzk4
-    Mjc0Y2U0NGZhYmU2M2RlOTJkOWMzNGRmMzhiOTdiM2QwYWVkN2U=
-  data.tar.gz: !binary |-
-    MmYwODFlNzA0ZGUyNTQyNWQyY2JiNzcxNTNhMWYwMjYxZDFjN2ExZDY3ZTcy
-    OWEyMmMwYTM3YzEwMGRiM2I2MmYxYWM1YTQxZjg2Mjc2YmI4ZmQ1ODJlZmYy
-    ZDYyMWQ5MDJmZTgyNjI5Yjk1ZDJlMzIxODA0ZmE0MWYyZWJiODU=

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in egon.gemspec
-gemspec

data/Gemfile.lock

@@ -1,144 +0,0 @@
-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/egon.gemspec

@@ -1,30 +0,0 @@
-# coding: utf-8
-require File.expand_path('../lib/egon/version', __FILE__)
-require 'date'
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |s|
-  s.name          = "egon"
-  s.version       = Egon::VERSION
-  s.authors	  = ['Egon and Fusor team']
-  s.email         = ['foreman-dev+egon@googlegroups.com']
-  s.summary       = %q{A library on top of Fog that encapsulates TripleO deployment operations}
-  s.description   = %q{}
-  s.homepage      = 'https://github.com/fusor/egon'
-  s.date          = Date.today.to_s
-  s.license       = 'GPL-3.0+'
-
-  s.files         = Dir['**/*']
-  s.test_files    = Dir['{test,spec,features}/**/*']
-  s.executables   = Dir['bin/*'].map{ |f| File.basename(f) }
-
-  s.require_paths = ["lib"]
-
-  s.add_development_dependency "bundler", "~> 1.7"
-  s.add_development_dependency "rake", "~> 10.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/rubygem-egon.spec

@@ -1,116 +0,0 @@
-%{?scl:%scl_package rubygem-%{gem_name}}
-%{!?scl:%global pkg_name %{name}}
-
-%global gem_name egon
-
-Name: %{?scl_prefix}rubygem-%{gem_name}
-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+
-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.36.0
-Requires: %{?scl_prefix}rubygem(net-ssh) => 2.9.2
-Requires: %{?scl_prefix}rubygem(net-ssh) < 2.10
-BuildArch: noarch
-
-%description
-A library on top of Fog that encapsulates TripleO deployment operations.
-
-%package doc
-Summary: Documentation for %{pkg_name}
-Group: Documentation
-Requires: %{?scl_prefix}%{pkg_name} = %{version}-%{release}
-BuildArch: noarch
-
-%description doc
-Documentation for %{pkg_name}.
-
-%prep
-%{?scl:scl enable %{scl} - << \EOF}
-gem unpack %{SOURCE0}
-%{?scl:EOF}
-
-%setup -q -D -T -n  %{gem_name}-%{version}
-
-%{?scl:scl enable %{scl} - << \EOF}
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-%{?scl:EOF}
-
-%build
-# Create the gem as gem install only works on a gem file
-%{?scl:scl enable %{scl} - << \EOF}
-gem build %{gem_name}.gemspec
-%{?scl:EOF}
-
-%{?scl:scl enable %{scl} - << \EOF}
-gem install %{gem_name}-%{version}.gem --local --install-dir .%{gem_dir}
-%{?scl:EOF}
-
-%install
-mkdir -p %{buildroot}%{gem_dir}
-mkdir .%{_bindir}
-mv .%{gem_dir}/bin/* \
-        .%{_bindir}
-cp -a .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
-
-mkdir -p %{buildroot}%{_bindir}
-cp -pa .%{_bindir}/* \
-        %{buildroot}%{_bindir}/
-
-find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
-
-# Run the test suite
-
-%check
-pushd .%{gem_instdir}
-
-popd
-
-%files
-%dir %{gem_instdir}
-%{_bindir}/undercloud-install-local.rb
-%{_bindir}/undercloud-install-satellite.rb
-%{_bindir}/undercloud-install-vanilla-rhel.rb
-%license %{gem_instdir}/LICENSE
-%{gem_instdir}/bin
-%{gem_libdir}
-%{gem_instdir}/rubygem-egon.spec
-%exclude %{gem_cache}
-%{gem_spec}
-
-%files doc
-%doc %{gem_docdir}
-%{gem_instdir}/Gemfile
-%doc %{gem_instdir}/README.md
-%{gem_instdir}/Rakefile
-%{gem_instdir}/egon.gemspec
-%{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)
-
-* Thu Sep 10 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-6
-- remove dev require (jmontleo@redhat.com)
-
-* Thu Sep 10 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-5
-- Allow newer version of fog 
-
-* Wed Sep 09 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-4
-- remove bad require (jmontleo@redhat.com)
-
-* Wed Sep 09 2015 Jason Montleon <jmontleo@redhat.com> 0.4.2-3
-- Egon RPM compatible with SCL and Foreman (jrist@redhat.com)
-- Egon RPM compatible with SCL (jrist@redhat.com)
-
-* Mon Aug 31 2015 jrist <jrist@redhat.com> - 0.4.1-1
-- Initial package