Skip to content

Instantly share code, notes, and snippets.

View daviddavis's full-sized avatar

David Davis daviddavis

View GitHub Profile
# Dockerfile sat6-client
FROM registry.access.redhat.com/rhel7
RUN rpm -Uvh http://prometheus.usersys.redhat.com/pub/katello-ca-consumer-latest.noarch.rpm
RUN subscription-manager register --activationkey=zookey --username=admin --password=changeme
RUN yum install -y katello-agent
RUN yum install -y zoo-lander
CMD /bin/bash
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
index 0482fc7..a1801e6 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
@@ -17,6 +17,7 @@
*
* @requires $scope
* @requires ContentView
+ * @requires Nutupane
* @requires translate
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
index 0482fc7..a1801e6 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
@@ -17,6 +17,7 @@
*
* @requires $scope
* @requires ContentView
+ * @requires Nutupane
* @requires translate
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
index 0482fc7..a1801e6 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js
@@ -17,6 +17,7 @@
*
* @requires $scope
* @requires ContentView
+ * @requires Nutupane
* @requires translate
### File managed with puppet ###
## Module: 'puppet'
[main]
# The Puppet log directory.
# The default value is '$vardir/log'.
logdir = /var/log/puppet
# Where Puppet PID files are kept.
# The default value is '$vardir/run'.
diff --git a/app/models/katello/concerns/container_extensions.rb b/app/models/katello/concerns/container_extensions.rb
index 8442c9b..bf152ce 100644
--- a/app/models/katello/concerns/container_extensions.rb
+++ b/app/models/katello/concerns/container_extensions.rb
@@ -26,7 +26,7 @@ module Katello
def repository_pull_url_with_katello
repo_url = repository_pull_url_without_katello
if Repository.where(:pulp_id => repository_name).count > 0
- image_capsule = self.capsule || CapsuleContent.default_capsule.capsule
+ image_capsule = self.capsule || CapsuleContent.default_capsule
diff --git a/app/lib/actions/katello/content_view_version/destroy.rb b/app/lib/actions/katello/content_view_version/destroy.rb
index 5f6523d..c0393b2 100644
--- a/app/lib/actions/katello/content_view_version/destroy.rb
+++ b/app/lib/actions/katello/content_view_version/destroy.rb
@@ -24,7 +24,7 @@ module Actions
repo_options[:planned_destroy] = true
plan_action(Repository::Destroy, repo, repo_options)
end
- plan_action(ContentViewPuppetEnvironment::Destroy, version.archive_puppet_environment)
+ plan_action(ContentViewPuppetEnvironment::Destroy, version.archive_puppet_environment) unless version.default?
diff --git a/lib/hammer_cli_foreman_docker/docker_image.rb b/lib/hammer_cli_foreman_docker/docker_image.rb
index b9ee01e..46e3147 100644
--- a/lib/hammer_cli_foreman_docker/docker_image.rb
+++ b/lib/hammer_cli_foreman_docker/docker_image.rb
@@ -5,6 +5,8 @@ module HammerCLIForemanDocker
desc _('Manage docker images')
class ListCommand < HammerCLIForeman::ListCommand
+ include ::HammerCLIKatello::LifecycleEnvironmentNameResolvable
+
#!/usr/bin/env bats
# vim: ft=sh:sw=2:et:tw=100
@test "create a product" {
hammer -u admin -p changeme product create --organization="Default Organization" \
--name="Docker Product" | grep -q "Product created"
}
@test "create Docker repository" {
hammer -u admin -p changeme repository create --organization="Default Organization" \
@daviddavis
daviddavis / keybase.md
Created February 21, 2015 22:24
keybase proof!!!

Keybase proof

I hereby claim:

  • I am daviddavis on github.
  • I am daviddavis (https://keybase.io/daviddavis) on keybase.
  • I have a public key whose fingerprint is DFCF D3DB 953E EF99 4C3A C5C7 5262 7FE2 5BC7 E2D6

To claim this, I am signing this object: