From 0abd47c31946f5f4722c34ec8022a0594f8346b6 Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Thu, 10 Mar 2016 17:44:17 -0500 Subject: [PATCH 1/7] a simple subcommand to verify the builtin tools are installed --- ansible-dk-cli/ansible-dk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ansible-dk-cli/ansible-dk b/ansible-dk-cli/ansible-dk index f7c974e..ac38f54 100755 --- a/ansible-dk-cli/ansible-dk +++ b/ansible-dk-cli/ansible-dk @@ -82,6 +82,23 @@ def shell_init(shell, debug=False): print("export PYTHONUSERBASE=\""+HOME+"/.ansible-dk/python\"") print("export PIP_INSTALL_OPTION=\"--user\"") +@cli.command() +def verify(): + commands = [ + 'ansible-dk --version', + 'aws --version 2>&1 | tr " " "\n" | tr "/" " "', + 'ansible --version', + 'ansible-lint --version', + 'ruby --version', + 'kitchen --version', + 'gem list ^kitchen-* | tail -n+0', + ] + for command in commands: + if os.system(command) != 0: + print "Verification of %s failed." % command.split()[0] + sys.exit(-1) + print "Verification succeeded." + # -- generate command @generate.command(name='playbook') @click.option('--name', required=True, help='Name of playbook to generate') From ffae8dc8afec3eb0f8b83b1f512034f332a11721 Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Thu, 10 Mar 2016 18:14:09 -0500 Subject: [PATCH 2/7] just tidying up a bit --- ansible-dk-cli/ansible-dk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ansible-dk-cli/ansible-dk b/ansible-dk-cli/ansible-dk index ac38f54..db220f2 100755 --- a/ansible-dk-cli/ansible-dk +++ b/ansible-dk-cli/ansible-dk @@ -13,6 +13,7 @@ RUBY_ABI = "2.1.0" PYTHON_ABI = "2.7" HOME = os.getenv("HOME") +# pull version from version-manifest file left by package install def check_version(): file='/opt/ansible-dk/version-manifest.json' try: @@ -32,18 +33,14 @@ def check_version(): return version ################################################### -# Generic top-level group definitions +# Generic top-level group definition @click.group() @click.version_option(version=check_version()) def cli(): pass - -@cli.group() -def generate(): - pass - - +################################################### +# shell-init command @cli.command(name='shell-init') @click.option('--debug', is_flag=True, help="Enable debug mode") @click.argument('shell', default='bash') @@ -66,7 +63,7 @@ def shell_init(shell, debug=False): except OSError as e: if e.errno == 17: # if file exists if debug: - print("[DEBUG] %s - skipping - %s" % (e.strerror, e.filename)) + print("[DEBUG] %s - skipping - %s" % (e.strerror, e.filename)) pass else: print("Error creating %s - %s(%d)" % (e.filename, e.strerror, e.errno)) @@ -82,6 +79,8 @@ def shell_init(shell, debug=False): print("export PYTHONUSERBASE=\""+HOME+"/.ansible-dk/python\"") print("export PIP_INSTALL_OPTION=\"--user\"") +################################################### +# verify command @cli.command() def verify(): commands = [ @@ -99,19 +98,22 @@ def verify(): sys.exit(-1) print "Verification succeeded." -# -- generate command +################################################### +# generate command +@cli.group() +def generate(): + pass + @generate.command(name='playbook') @click.option('--name', required=True, help='Name of playbook to generate') def generate_playbook(name): print("Generating playbook: ", name) - @generate.command(name='role') @click.option('--name', required=True, help='Name of role to generate') def generate_role(name): print("Generating role: ", name) - ################################################### # Call main CLI if __name__ == '__main__': From 435447171dac317f72608c0bcc57ca3e92eb0185 Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Mon, 14 Mar 2016 10:27:57 -0400 Subject: [PATCH 3/7] add verification of serverspec and jq --- ansible-dk-cli/ansible-dk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible-dk-cli/ansible-dk b/ansible-dk-cli/ansible-dk index db220f2..b9cae83 100755 --- a/ansible-dk-cli/ansible-dk +++ b/ansible-dk-cli/ansible-dk @@ -90,7 +90,8 @@ def verify(): 'ansible-lint --version', 'ruby --version', 'kitchen --version', - 'gem list ^kitchen-* | tail -n+0', + 'gem list ^kitchen-* serverspec | tail -n+0', + 'jq --version' ] for command in commands: if os.system(command) != 0: From a9065fe781a9395d6281a17e25836301298b4c1f Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Mon, 14 Mar 2016 10:31:04 -0400 Subject: [PATCH 4/7] removing ansible-toolkit for now, until it is updated to support ansible 2.0 --- omnibus-ansible-dk/config/projects/ansible-dk.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/omnibus-ansible-dk/config/projects/ansible-dk.rb b/omnibus-ansible-dk/config/projects/ansible-dk.rb index 38a1f2e..b7de1bd 100644 --- a/omnibus-ansible-dk/config/projects/ansible-dk.rb +++ b/omnibus-ansible-dk/config/projects/ansible-dk.rb @@ -27,7 +27,6 @@ override :paramiko, version: "1.16.0" override :pycrypto, version: "2.6.1" override :'ansible-lint', version: "2.3.3" -override :'ansible-toolkit', version: "1.3.2" override :appbundler, version: "v0.7.0" override :serverspec, version: "v2.30.1" override :molecule, version: "1.3.0" @@ -46,7 +45,6 @@ dependency "awscli" dependency "ansible" dependency "ansible-lint" -dependency "ansible-toolkit" dependency "molecule" # Ruby land From 151c7fcac38f65991d8bb48d6bc41ff7d22d2d8b Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Mon, 14 Mar 2016 10:42:24 -0400 Subject: [PATCH 5/7] move omnibus project to top level --- .gitignore | 12 ++ .../.kitchen.yml => .kitchen.yml | 0 omnibus-ansible-dk/Berksfile => Berksfile | 0 .../Berksfile.lock => Berksfile.lock | 0 omnibus-ansible-dk/Gemfile => Gemfile | 0 README.md | 122 ++++++++++++++++++ .../config => config}/projects/ansible-dk.rb | 0 .../software/ansible-dk-cli.rb | 0 .../software/ansible-lint.rb | 0 .../software/ansible-toolkit.rb | 0 .../config => config}/software/ansible.rb | 0 .../config => config}/software/awscli.rb | 0 .../config => config}/software/bats.rb | 0 .../config => config}/software/boto.rb | 0 .../config => config}/software/bzip2.rb | 0 .../config => config}/software/click.rb | 0 .../config => config}/software/jq.rb | 0 .../software/kitchen-ansible.rb | 0 .../config => config}/software/kitchen-ec2.rb | 0 .../software/kitchen-vagrant.rb | 0 .../config => config}/software/liblzma.rb | 0 .../config => config}/software/molecule.rb | 0 .../config => config}/software/paramiko.rb | 0 .../config => config}/software/pip.rb | 0 .../config => config}/software/pycrypto.rb | 0 .../config => config}/software/python.rb | 0 .../config => config}/software/serverspec.rb | 0 .../config => config}/software/setuptools.rb | 0 .../software/test-kitchen.rb | 0 omnibus-ansible-dk/metadata.rb => metadata.rb | 0 omnibus-ansible-dk/.gitignore | 12 -- omnibus-ansible-dk/README.md | 120 ----------------- omnibus-ansible-dk/omnibus.rb => omnibus.rb | 0 .../ansible-dk/postinst | 0 .../ansible-dk/prerm | 0 .../recipes => recipes}/default.rb | 0 .../recipes => recipes}/fix-ubuntu-1310.rb | 0 .../ansible-dk/dmg/background.png | Bin .../ansible-dk/dmg/background.psd | Bin .../ansible-dk/dmg/icon.png | Bin .../ansible-dk/dmg/logofinal.png | Bin .../ansible-dk/pkg/background.png | Bin .../ansible-dk/pkg/distribution.xml.erb | 0 .../ansible-dk/pkg/license.html.erb | 0 .../ansible-dk/pkg/welcome.html.erb | 0 45 files changed, 134 insertions(+), 132 deletions(-) rename omnibus-ansible-dk/.kitchen.yml => .kitchen.yml (100%) rename omnibus-ansible-dk/Berksfile => Berksfile (100%) rename omnibus-ansible-dk/Berksfile.lock => Berksfile.lock (100%) rename omnibus-ansible-dk/Gemfile => Gemfile (100%) rename {omnibus-ansible-dk/config => config}/projects/ansible-dk.rb (100%) rename {omnibus-ansible-dk/config => config}/software/ansible-dk-cli.rb (100%) rename {omnibus-ansible-dk/config => config}/software/ansible-lint.rb (100%) rename {omnibus-ansible-dk/config => config}/software/ansible-toolkit.rb (100%) rename {omnibus-ansible-dk/config => config}/software/ansible.rb (100%) rename {omnibus-ansible-dk/config => config}/software/awscli.rb (100%) rename {omnibus-ansible-dk/config => config}/software/bats.rb (100%) rename {omnibus-ansible-dk/config => config}/software/boto.rb (100%) rename {omnibus-ansible-dk/config => config}/software/bzip2.rb (100%) rename {omnibus-ansible-dk/config => config}/software/click.rb (100%) rename {omnibus-ansible-dk/config => config}/software/jq.rb (100%) rename {omnibus-ansible-dk/config => config}/software/kitchen-ansible.rb (100%) rename {omnibus-ansible-dk/config => config}/software/kitchen-ec2.rb (100%) rename {omnibus-ansible-dk/config => config}/software/kitchen-vagrant.rb (100%) rename {omnibus-ansible-dk/config => config}/software/liblzma.rb (100%) rename {omnibus-ansible-dk/config => config}/software/molecule.rb (100%) rename {omnibus-ansible-dk/config => config}/software/paramiko.rb (100%) rename {omnibus-ansible-dk/config => config}/software/pip.rb (100%) rename {omnibus-ansible-dk/config => config}/software/pycrypto.rb (100%) rename {omnibus-ansible-dk/config => config}/software/python.rb (100%) rename {omnibus-ansible-dk/config => config}/software/serverspec.rb (100%) rename {omnibus-ansible-dk/config => config}/software/setuptools.rb (100%) rename {omnibus-ansible-dk/config => config}/software/test-kitchen.rb (100%) rename omnibus-ansible-dk/metadata.rb => metadata.rb (100%) delete mode 100644 omnibus-ansible-dk/.gitignore delete mode 100644 omnibus-ansible-dk/README.md rename omnibus-ansible-dk/omnibus.rb => omnibus.rb (100%) rename {omnibus-ansible-dk/package-scripts => package-scripts}/ansible-dk/postinst (100%) rename {omnibus-ansible-dk/package-scripts => package-scripts}/ansible-dk/prerm (100%) rename {omnibus-ansible-dk/recipes => recipes}/default.rb (100%) rename {omnibus-ansible-dk/recipes => recipes}/fix-ubuntu-1310.rb (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/dmg/background.png (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/dmg/background.psd (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/dmg/icon.png (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/dmg/logofinal.png (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/pkg/background.png (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/pkg/distribution.xml.erb (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/pkg/license.html.erb (100%) rename {omnibus-ansible-dk/resources => resources}/ansible-dk/pkg/welcome.html.erb (100%) diff --git a/.gitignore b/.gitignore index 79b5594..4bf3283 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,13 @@ **/.DS_Store +*.gem +.bundle +.kitchen/ +.kitchen.*.yml +vendor/bundle +pkg/* +.vagrant +bin/* +files/**/cache/ +vendor/cookbooks +local/ +Gemfile.lock diff --git a/omnibus-ansible-dk/.kitchen.yml b/.kitchen.yml similarity index 100% rename from omnibus-ansible-dk/.kitchen.yml rename to .kitchen.yml diff --git a/omnibus-ansible-dk/Berksfile b/Berksfile similarity index 100% rename from omnibus-ansible-dk/Berksfile rename to Berksfile diff --git a/omnibus-ansible-dk/Berksfile.lock b/Berksfile.lock similarity index 100% rename from omnibus-ansible-dk/Berksfile.lock rename to Berksfile.lock diff --git a/omnibus-ansible-dk/Gemfile b/Gemfile similarity index 100% rename from omnibus-ansible-dk/Gemfile rename to Gemfile diff --git a/README.md b/README.md index 4db4b47..c5c918e 100644 --- a/README.md +++ b/README.md @@ -124,3 +124,125 @@ For giving us a clue for how to build and package python modules under omnibus * Chef, Inc. For Omnibus, and the many build definitions we are using. + + +ansible-dk Omnibus project +========================= +This project creates full-stack platform-specific packages for +`ansible-dk`! + +Installation +------------ +You must have a sane Ruby 1.9+ environment with Bundler installed. Ensure all +the required gems are installed: + +```shell +$ bundle install --binstubs +``` + +Usage +----- +### Build + +You create a platform-specific package using the `build project` command: + +```shell +$ bin/omnibus build ansible-dk +``` + +The platform/architecture type of the package created will match the platform +where the `build project` command is invoked. For example, running this command +on a MacBook Pro will generate a Mac OS X package. After the build completes +packages will be available in the `pkg/` folder. + +### Clean + +You can clean up all temporary files generated during the build process with +the `clean` command: + +```shell +$ bin/omnibus clean ansibledk +``` + +Adding the `--purge` purge option removes __ALL__ files generated during the +build including the project install directory (`/opt/ansibledk`) and +the package cache directory (`/var/cache/omnibus/pkg`): + +```shell +$ bin/omnibus clean ansibledk --purge +``` + +### Publish + +Omnibus has a built-in mechanism for releasing to a variety of "backends", such +as Amazon S3. You must set the proper credentials in your `omnibus.rb` config +file or specify them via the command line. + +```shell +$ bin/omnibus publish path/to/*.deb --backend s3 +``` + +### Help + +Full help for the Omnibus command line interface can be accessed with the +`help` command: + +```shell +$ bin/omnibus help +``` + +Version Manifest +---------------- + +Git-based software definitions may specify branches as their +default_version. In this case, the exact git revision to use will be +determined at build-time unless a project override (see below) or +external version manifest is used. To generate a version manifest use +the `omnibus manifest` command: + +``` +omnibus manifest PROJECT -l warn +``` + +This will output a JSON-formatted manifest containing the resolved +version of every software definition. + + +Kitchen-based Build Environment +------------------------------- +Every Omnibus project ships will a project-specific +[Berksfile](http://berkshelf.com/) that will allow you to build your omnibus projects on all of the projects listed +in the `.kitchen.yml`. You can add/remove additional platforms as needed by +changing the list found in the `.kitchen.yml` `platforms` YAML stanza. + +This build environment is designed to get you up-and-running quickly. However, +there is nothing that restricts you to building on other platforms. Simply use +the [omnibus cookbook](https://github.com/opscode-cookbooks/omnibus) to setup +your desired platform and execute the build steps listed above. + +The default build environment requires Test Kitchen and VirtualBox for local +development. Test Kitchen also exposes the ability to provision instances using +various cloud providers like AWS, DigitalOcean, or OpenStack. For more +information, please see the [Test Kitchen documentation](http://kitchen.ci). + +Once you have tweaked your `.kitchen.yml` (or `.kitchen.local.yml`) to your +liking, you can bring up an individual build environment using the `kitchen` +command. + +```shell +$ bin/kitchen converge ubuntu-1204 +``` + +Then login to the instance and build the project as described in the Usage +section: + +```shell +$ bundle exec kitchen login ubuntu-1204 +[vagrant@ubuntu...] $ cd ansibledk +[vagrant@ubuntu...] $ bundle install +[vagrant@ubuntu...] $ ... +[vagrant@ubuntu...] $ bin/omnibus build ansibledk +``` + +For a complete list of all commands and platforms, run `kitchen list` or +`kitchen help`. diff --git a/omnibus-ansible-dk/config/projects/ansible-dk.rb b/config/projects/ansible-dk.rb similarity index 100% rename from omnibus-ansible-dk/config/projects/ansible-dk.rb rename to config/projects/ansible-dk.rb diff --git a/omnibus-ansible-dk/config/software/ansible-dk-cli.rb b/config/software/ansible-dk-cli.rb similarity index 100% rename from omnibus-ansible-dk/config/software/ansible-dk-cli.rb rename to config/software/ansible-dk-cli.rb diff --git a/omnibus-ansible-dk/config/software/ansible-lint.rb b/config/software/ansible-lint.rb similarity index 100% rename from omnibus-ansible-dk/config/software/ansible-lint.rb rename to config/software/ansible-lint.rb diff --git a/omnibus-ansible-dk/config/software/ansible-toolkit.rb b/config/software/ansible-toolkit.rb similarity index 100% rename from omnibus-ansible-dk/config/software/ansible-toolkit.rb rename to config/software/ansible-toolkit.rb diff --git a/omnibus-ansible-dk/config/software/ansible.rb b/config/software/ansible.rb similarity index 100% rename from omnibus-ansible-dk/config/software/ansible.rb rename to config/software/ansible.rb diff --git a/omnibus-ansible-dk/config/software/awscli.rb b/config/software/awscli.rb similarity index 100% rename from omnibus-ansible-dk/config/software/awscli.rb rename to config/software/awscli.rb diff --git a/omnibus-ansible-dk/config/software/bats.rb b/config/software/bats.rb similarity index 100% rename from omnibus-ansible-dk/config/software/bats.rb rename to config/software/bats.rb diff --git a/omnibus-ansible-dk/config/software/boto.rb b/config/software/boto.rb similarity index 100% rename from omnibus-ansible-dk/config/software/boto.rb rename to config/software/boto.rb diff --git a/omnibus-ansible-dk/config/software/bzip2.rb b/config/software/bzip2.rb similarity index 100% rename from omnibus-ansible-dk/config/software/bzip2.rb rename to config/software/bzip2.rb diff --git a/omnibus-ansible-dk/config/software/click.rb b/config/software/click.rb similarity index 100% rename from omnibus-ansible-dk/config/software/click.rb rename to config/software/click.rb diff --git a/omnibus-ansible-dk/config/software/jq.rb b/config/software/jq.rb similarity index 100% rename from omnibus-ansible-dk/config/software/jq.rb rename to config/software/jq.rb diff --git a/omnibus-ansible-dk/config/software/kitchen-ansible.rb b/config/software/kitchen-ansible.rb similarity index 100% rename from omnibus-ansible-dk/config/software/kitchen-ansible.rb rename to config/software/kitchen-ansible.rb diff --git a/omnibus-ansible-dk/config/software/kitchen-ec2.rb b/config/software/kitchen-ec2.rb similarity index 100% rename from omnibus-ansible-dk/config/software/kitchen-ec2.rb rename to config/software/kitchen-ec2.rb diff --git a/omnibus-ansible-dk/config/software/kitchen-vagrant.rb b/config/software/kitchen-vagrant.rb similarity index 100% rename from omnibus-ansible-dk/config/software/kitchen-vagrant.rb rename to config/software/kitchen-vagrant.rb diff --git a/omnibus-ansible-dk/config/software/liblzma.rb b/config/software/liblzma.rb similarity index 100% rename from omnibus-ansible-dk/config/software/liblzma.rb rename to config/software/liblzma.rb diff --git a/omnibus-ansible-dk/config/software/molecule.rb b/config/software/molecule.rb similarity index 100% rename from omnibus-ansible-dk/config/software/molecule.rb rename to config/software/molecule.rb diff --git a/omnibus-ansible-dk/config/software/paramiko.rb b/config/software/paramiko.rb similarity index 100% rename from omnibus-ansible-dk/config/software/paramiko.rb rename to config/software/paramiko.rb diff --git a/omnibus-ansible-dk/config/software/pip.rb b/config/software/pip.rb similarity index 100% rename from omnibus-ansible-dk/config/software/pip.rb rename to config/software/pip.rb diff --git a/omnibus-ansible-dk/config/software/pycrypto.rb b/config/software/pycrypto.rb similarity index 100% rename from omnibus-ansible-dk/config/software/pycrypto.rb rename to config/software/pycrypto.rb diff --git a/omnibus-ansible-dk/config/software/python.rb b/config/software/python.rb similarity index 100% rename from omnibus-ansible-dk/config/software/python.rb rename to config/software/python.rb diff --git a/omnibus-ansible-dk/config/software/serverspec.rb b/config/software/serverspec.rb similarity index 100% rename from omnibus-ansible-dk/config/software/serverspec.rb rename to config/software/serverspec.rb diff --git a/omnibus-ansible-dk/config/software/setuptools.rb b/config/software/setuptools.rb similarity index 100% rename from omnibus-ansible-dk/config/software/setuptools.rb rename to config/software/setuptools.rb diff --git a/omnibus-ansible-dk/config/software/test-kitchen.rb b/config/software/test-kitchen.rb similarity index 100% rename from omnibus-ansible-dk/config/software/test-kitchen.rb rename to config/software/test-kitchen.rb diff --git a/omnibus-ansible-dk/metadata.rb b/metadata.rb similarity index 100% rename from omnibus-ansible-dk/metadata.rb rename to metadata.rb diff --git a/omnibus-ansible-dk/.gitignore b/omnibus-ansible-dk/.gitignore deleted file mode 100644 index 4c8cc4e..0000000 --- a/omnibus-ansible-dk/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.gem -.bundle -.kitchen/ -.kitchen.*.yml -vendor/bundle -pkg/* -.vagrant -bin/* -files/**/cache/ -vendor/cookbooks -local/ -Gemfile.lock diff --git a/omnibus-ansible-dk/README.md b/omnibus-ansible-dk/README.md deleted file mode 100644 index 2c1aa46..0000000 --- a/omnibus-ansible-dk/README.md +++ /dev/null @@ -1,120 +0,0 @@ -ansible-dk Omnibus project -========================= -This project creates full-stack platform-specific packages for -`ansible-dk`! - -Installation ------------- -You must have a sane Ruby 1.9+ environment with Bundler installed. Ensure all -the required gems are installed: - -```shell -$ bundle install --binstubs -``` - -Usage ------ -### Build - -You create a platform-specific package using the `build project` command: - -```shell -$ bin/omnibus build ansible-dk -``` - -The platform/architecture type of the package created will match the platform -where the `build project` command is invoked. For example, running this command -on a MacBook Pro will generate a Mac OS X package. After the build completes -packages will be available in the `pkg/` folder. - -### Clean - -You can clean up all temporary files generated during the build process with -the `clean` command: - -```shell -$ bin/omnibus clean ansibledk -``` - -Adding the `--purge` purge option removes __ALL__ files generated during the -build including the project install directory (`/opt/ansibledk`) and -the package cache directory (`/var/cache/omnibus/pkg`): - -```shell -$ bin/omnibus clean ansibledk --purge -``` - -### Publish - -Omnibus has a built-in mechanism for releasing to a variety of "backends", such -as Amazon S3. You must set the proper credentials in your `omnibus.rb` config -file or specify them via the command line. - -```shell -$ bin/omnibus publish path/to/*.deb --backend s3 -``` - -### Help - -Full help for the Omnibus command line interface can be accessed with the -`help` command: - -```shell -$ bin/omnibus help -``` - -Version Manifest ----------------- - -Git-based software definitions may specify branches as their -default_version. In this case, the exact git revision to use will be -determined at build-time unless a project override (see below) or -external version manifest is used. To generate a version manifest use -the `omnibus manifest` command: - -``` -omnibus manifest PROJECT -l warn -``` - -This will output a JSON-formatted manifest containing the resolved -version of every software definition. - - -Kitchen-based Build Environment -------------------------------- -Every Omnibus project ships will a project-specific -[Berksfile](http://berkshelf.com/) that will allow you to build your omnibus projects on all of the projects listed -in the `.kitchen.yml`. You can add/remove additional platforms as needed by -changing the list found in the `.kitchen.yml` `platforms` YAML stanza. - -This build environment is designed to get you up-and-running quickly. However, -there is nothing that restricts you to building on other platforms. Simply use -the [omnibus cookbook](https://github.com/opscode-cookbooks/omnibus) to setup -your desired platform and execute the build steps listed above. - -The default build environment requires Test Kitchen and VirtualBox for local -development. Test Kitchen also exposes the ability to provision instances using -various cloud providers like AWS, DigitalOcean, or OpenStack. For more -information, please see the [Test Kitchen documentation](http://kitchen.ci). - -Once you have tweaked your `.kitchen.yml` (or `.kitchen.local.yml`) to your -liking, you can bring up an individual build environment using the `kitchen` -command. - -```shell -$ bin/kitchen converge ubuntu-1204 -``` - -Then login to the instance and build the project as described in the Usage -section: - -```shell -$ bundle exec kitchen login ubuntu-1204 -[vagrant@ubuntu...] $ cd ansibledk -[vagrant@ubuntu...] $ bundle install -[vagrant@ubuntu...] $ ... -[vagrant@ubuntu...] $ bin/omnibus build ansibledk -``` - -For a complete list of all commands and platforms, run `kitchen list` or -`kitchen help`. diff --git a/omnibus-ansible-dk/omnibus.rb b/omnibus.rb similarity index 100% rename from omnibus-ansible-dk/omnibus.rb rename to omnibus.rb diff --git a/omnibus-ansible-dk/package-scripts/ansible-dk/postinst b/package-scripts/ansible-dk/postinst similarity index 100% rename from omnibus-ansible-dk/package-scripts/ansible-dk/postinst rename to package-scripts/ansible-dk/postinst diff --git a/omnibus-ansible-dk/package-scripts/ansible-dk/prerm b/package-scripts/ansible-dk/prerm similarity index 100% rename from omnibus-ansible-dk/package-scripts/ansible-dk/prerm rename to package-scripts/ansible-dk/prerm diff --git a/omnibus-ansible-dk/recipes/default.rb b/recipes/default.rb similarity index 100% rename from omnibus-ansible-dk/recipes/default.rb rename to recipes/default.rb diff --git a/omnibus-ansible-dk/recipes/fix-ubuntu-1310.rb b/recipes/fix-ubuntu-1310.rb similarity index 100% rename from omnibus-ansible-dk/recipes/fix-ubuntu-1310.rb rename to recipes/fix-ubuntu-1310.rb diff --git a/omnibus-ansible-dk/resources/ansible-dk/dmg/background.png b/resources/ansible-dk/dmg/background.png similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/dmg/background.png rename to resources/ansible-dk/dmg/background.png diff --git a/omnibus-ansible-dk/resources/ansible-dk/dmg/background.psd b/resources/ansible-dk/dmg/background.psd similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/dmg/background.psd rename to resources/ansible-dk/dmg/background.psd diff --git a/omnibus-ansible-dk/resources/ansible-dk/dmg/icon.png b/resources/ansible-dk/dmg/icon.png similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/dmg/icon.png rename to resources/ansible-dk/dmg/icon.png diff --git a/omnibus-ansible-dk/resources/ansible-dk/dmg/logofinal.png b/resources/ansible-dk/dmg/logofinal.png similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/dmg/logofinal.png rename to resources/ansible-dk/dmg/logofinal.png diff --git a/omnibus-ansible-dk/resources/ansible-dk/pkg/background.png b/resources/ansible-dk/pkg/background.png similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/pkg/background.png rename to resources/ansible-dk/pkg/background.png diff --git a/omnibus-ansible-dk/resources/ansible-dk/pkg/distribution.xml.erb b/resources/ansible-dk/pkg/distribution.xml.erb similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/pkg/distribution.xml.erb rename to resources/ansible-dk/pkg/distribution.xml.erb diff --git a/omnibus-ansible-dk/resources/ansible-dk/pkg/license.html.erb b/resources/ansible-dk/pkg/license.html.erb similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/pkg/license.html.erb rename to resources/ansible-dk/pkg/license.html.erb diff --git a/omnibus-ansible-dk/resources/ansible-dk/pkg/welcome.html.erb b/resources/ansible-dk/pkg/welcome.html.erb similarity index 100% rename from omnibus-ansible-dk/resources/ansible-dk/pkg/welcome.html.erb rename to resources/ansible-dk/pkg/welcome.html.erb From 03d6eb56b6e2225c7286f4bc857204aedd2d12bd Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Mon, 14 Mar 2016 10:53:24 -0400 Subject: [PATCH 6/7] update paths in chef recipe --- recipes/default.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/default.rb b/recipes/default.rb index 22d8180..2769048 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -10,15 +10,15 @@ user node[:omnibus][:build_user] end -link "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk/.gitconfig" do +link "#{node[:omnibus][:project_repo]}/.gitconfig" do to "/home/#{node[:omnibus][:build_user]}/.gitconfig" end -file "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk/Gemfile.lock" do +file "#{node[:omnibus][:project_repo]}/Gemfile.lock" do action :delete end omnibus_build 'ansible-dk' do - project_dir "#{node[:omnibus][:project_repo]}/omnibus-ansible-dk" + project_dir "#{node[:omnibus][:project_repo]}" config_overrides({dummy: 'value' }) end From 0b9ba47f975ca407bb761b9dc5b3fc68cd744d49 Mon Sep 17 00:00:00 2001 From: Josh Blancett Date: Mon, 14 Mar 2016 10:53:34 -0400 Subject: [PATCH 7/7] update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c85265b..7885641 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [1.1.0] - 2016-03-14 + +- Removed ansible-toolkit - https://github.com/omniti-labs/ansible-dk/issues/58 +- Moved omnibus project to top level +- Added verify subcommand to ansible-dk cli to verify internal tools + ## [1.0.0] - 2016-03-07 ### Updated tools (jblancett)