####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
- add file
Hugh Saunders hughsaunders
hughsaunders
/ restore_km.command
Last active
December 15, 2015 12:19
Control bluetooth on a remote mac, so that its keyboard and mouse can be stolen or returned.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/usr/bin/env bash | |
| #Restore bluetooth peripherals to the iMac | |
| #ensure local bluetooth is off | |
| blueutil off | |
| #enable imac bluetooth | |
| ssh imac27 '/usr/local/bin/blueutil on' |
hughsaunders
/ gist:5291300
Created
April 2, 2013 10:28
why would my jenkins openstack instances get shutoff?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| jenkins@monkeybutler04:~/hughsaunders/jenkins-chef-nova-dingus$ nova list |grep SHUTOFF | |
| | 434a0619-c50e-4593-bd0e-0a018138ba3f | opencenter-multi-node-gate-jenkins-861-node3 | SHUTOFF | public=10.127.53.46 | | |
| | 4669ae6f-b9c4-4085-ae5f-16a1a86130d8 | opencenter-multi-node-gate-jenkins-861-ocserver | SHUTOFF | public=10.127.53.41 | | |
| | 8a94ffb0-617e-4150-9aef-6956bab43b3b | opencenter-multi-node-gate-jenkins-861-node2 | SHUTOFF | public=10.127.53.44 | | |
| | a7f6389e-4cb2-4331-b344-f46d69049faa | opencenter-multi-node-gate-jenkins-861-node5 | SHUTOFF | public=10.127.53.42 | | |
| | bd99882a-5cd8-4ebf-92e0-a6ecd7a6e104 | opencenter-multi-node-gate-jenkins-861-node1 | SHUTOFF | public=10.127.53.45 | | |
| | e2d50cc1-98d7-4927-9d01-603b7b33c6b0 | CloudNull_AmebaSystem | SHUTOFF | public=10.127.53.6 | |
hughsaunders
/ gist:5459519
Created
April 25, 2013 13:03
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) |
hughsaunders
/ gist:5583010
Created
May 15, 2013 10:24
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| (["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 |
hughsaunders
/ gist:5592759
Last active
December 17, 2015 10:09
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| boot(){ | |
| ./magnet.sh -s=chefserver.uk.rs.wherenow.org\ | |
| -n=osprivate\ | |
| -p=~/.ssh/id_rsa.pub\ | |
| -f=4\ | |
| -sc=6\ | |
| -c=grizzlyupgrade\ | |
| -e=grizzlyupgrade | |
| } |
hughsaunders
/ gist:5678964
Created
May 30, 2013 15:52
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
hughsaunders
/ gist:5769000
Created
June 12, 2013 20:51
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| (os)hugh@devstack:/opt/stack/python-openstackclient$ keystone role-list | |
| +----------------------------------+---------------+ | |
| | id | name | | |
| +----------------------------------+---------------+ | |
| | dfdd1fd1b08b456fba9f8aa1b0dd33e6 | Member | | |
| | 250c5ab9cd594e8282384c55aaa3fade | ResellerAdmin | | |
| | 9fe2ff9ee4384b1894a90878d3e92bab | _member_ | | |
| | 7ef175a354fa45c995230ee8b6b6844b | admin | | |
| | 359ba4b91991496f9ec7fa312dfa23f7 | anotherrole | | |
| +----------------------------------+---------------+ |
hughsaunders
/ gist:6065050
Created
July 23, 2013 18:48
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| >> [].foo | |
| NoMethodError: undefined method `foo' for []:Array | |
| from (irb):1 | |
| >> def foo | |
| >> return "bah" | |
| >> end | |
| => nil | |
| >> | |
| ?> [].foo | |
| => "bah" |
hughsaunders
/ Why do my gate intstances not have any attributes?
Created
July 25, 2013 14:31
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |