Skip to content

Instantly share code, notes, and snippets.

View hughsaunders's full-sized avatar

Hugh Saunders hughsaunders

View GitHub Profile
[2013-08-07T13:00:03+00:00] INFO: runit_service[git-daemon] configured
[2013-08-07T13:00:03+00:00] INFO: Processing service[git-daemon] action nothing (dynamically defined)
[2013-08-07T13:00:03+00:00] INFO: Processing runit_service[git-daemon] action enable (swift-private-cloud::admin-server line 32)
[2013-08-07T13:00:03+00:00] INFO: Processing directory[/etc/sv/git-daemon] action create (dynamically defined)
[2013-08-07T13:00:03+00:00] INFO: Processing template[/etc/sv/git-daemon/run] action create (dynamically defined)
[2013-08-07T13:00:04+00:00] INFO: template[/etc/sv/git-daemon/run] backed up to /var/chef/backup/etc/sv/git-daemon/run.chef-20130807130004
[2013-08-07T13:00:04+00:00] INFO: template[/etc/sv/git-daemon/run] updated content
[2013-08-07T13:00:04+00:00] INFO: template[/etc/sv/git-daemon/run] mode changed to 755
[2013-08-07T13:00:04+00:00] INFO: Processing directory[/etc/sv/git-daemon/log] action create (dynamically defined)
[2013-08-07T13:00:04+00:00] INFO: Processing directory[/etc/sv/git-daemon
Compiling Cookbooks...
================================================================================
Recipe Compile Error in /var/chef/cache/cookbooks/swift-private-cloud/recipes/admin-server.rb
================================================================================
ArgumentError
-------------
address family must be specified
root@all-jenkins-189-chef-server:~# knife node show all-jenkins-189-api2.novalocal
Node Name: all-jenkins-189-api2.novalocal
Environment: bigcluster
FQDN: all-jenkins-189-api2.novalocal
IP: 10.127.53.57
Run List: role[mysql-master], role[rsyslog-server], role[rabbitmq-server], role[base], role[cinder-api], role[glance-api], role[nova-conductor], role[nova-scheduler], role[nova-api-os-compute], role[nova-api-ec2], role[swift-proxy-server], role[keystone-api], role[ceilometer-setup], role[ceilometer-api], role[ceilometer-central-agent], role[ceilometer-collector]
Roles: mysql-master, base, rsyslog-server, rabbitmq-server, cinder-api, glance-api, nova-conductor, nova-scheduler, nova-api-os-compute, nova-api-ec2, swift-proxy-server, keystone-api, ceilometer-setup, ceilometer-api, ceilometer-central-agent, ceilometer-collector
Recipes: osops-utils::packages, openssh, ntp, sosreport, rsyslog::default, hardware, osops-utils::default, mysql-openstack::server, openstack-monitoring::mysql
>> [].foo
NoMethodError: undefined method `foo' for []:Array
from (irb):1
>> def foo
>> return "bah"
>> end
=> nil
>>
?> [].foo
=> "bah"
@hughsaunders
hughsaunders / gist:6062300
Last active December 20, 2015 03:19
merge conflict resolution

Simple example of a merge conflict

####Overview

  • add a file
  • create new branch
  • modify same section of file in both branches in a conflicting way
  • attempt to merge one branch into the other

####Process

  1. add file
(os)hugh@devstack:/opt/stack/python-openstackclient$ keystone role-list
+----------------------------------+---------------+
| id | name |
+----------------------------------+---------------+
| dfdd1fd1b08b456fba9f8aa1b0dd33e6 | Member |
| 250c5ab9cd594e8282384c55aaa3fade | ResellerAdmin |
| 9fe2ff9ee4384b1894a90878d3e92bab | _member_ |
| 7ef175a354fa45c995230ee8b6b6844b | admin |
| 359ba4b91991496f9ec7fa312dfa23f7 | anotherrole |
+----------------------------------+---------------+
root@grizzlyupgrade1:/opt/exerstack# ./exercise.sh folsom nova-cli.sh
Running test suite for packageset "folsom"
=== nova-cli ===
010_nova_image-list 0.917s
011_nova_image-show 1.686s
012_nova_flavor-list 1.560s
020_shared_key-nova_keypair-add 1.931s
021_verify_fingerprints_match 1.581s
boot(){
./magnet.sh -s=chefserver.uk.rs.wherenow.org\
-n=osprivate\
-p=~/.ssh/id_rsa.pub\
-f=4\
-sc=6\
-c=grizzlyupgrade\
-e=grizzlyupgrade
}
(["python-keystone"] + platform_options["api_ec2_packages"]).each do |pkg|
package pkg do
action node["osops"]["do_package_upgrades"] == true ? :upgrade : :install
options platform_options["package_overrides"]
end
end
diff --git a/glanceclient/v1/shell.py b/glanceclient/v1/shell.py
index 02d3c01..e1b2a35 100644
--- a/glanceclient/v1/shell.py
+++ b/glanceclient/v1/shell.py
@@ -121,7 +121,10 @@ def _set_data_field(fields, args):
# (3) no image data provided:
# glance ...
try:
- os.fstat(0)
+ stat_result = os.fstat(0)