Juju Charm Tools

Merge lp://staging/~tvansteenburgh/charm-tools/ansible-template into lp://staging/charm-tools/1.4

  1. ansible-template
  2. Merge into 1.4
Proposed by Tim Van Steenburgh
Status: Merged
Merge reported by: Tim Van Steenburgh
Merged at revision: not available
Proposed branch: lp://staging/~tvansteenburgh/charm-tools/ansible-template
Merge into: lp://staging/charm-tools/1.4
Diff against target: 1271 lines (+984/-106)
23 files modified
charmtools/charms.py (+1/-1)
charmtools/generators/template.py (+8/-0)
charmtools/templates/ansible/__init__.py (+18/-0)
charmtools/templates/ansible/files/Makefile (+24/-0)
charmtools/templates/ansible/files/README.ex (+44/-0)
charmtools/templates/ansible/files/charm-helpers.yaml (+7/-0)
charmtools/templates/ansible/files/config.yaml (+14/-0)
charmtools/templates/ansible/files/hooks/hooks.py (+35/-0)
charmtools/templates/ansible/files/icon.svg (+279/-0)
charmtools/templates/ansible/files/metadata.yaml (+17/-0)
charmtools/templates/ansible/files/playbooks/site.yaml (+47/-0)
charmtools/templates/ansible/files/revision (+1/-0)
charmtools/templates/ansible/files/scripts/charm_helpers_sync.py (+225/-0)
charmtools/templates/ansible/files/unit_tests/test_hooks.py (+62/-0)
charmtools/templates/ansible/template.py (+88/-0)
charmtools/templates/python/config.yaml (+0/-5)
charmtools/templates/python/files/hooks_symlinked/hooks.py (+0/-54)
charmtools/templates/python/template.py (+0/-16)
setup.py (+1/-0)
tests/test_charm_proof.py (+4/-1)
tests_functional/create/test.sh (+3/-0)
tests_functional/create/test_ansible_create.py (+101/-0)
tests_functional/create/test_python_create.py (+5/-29)
To merge this branch: bzr merge lp://staging/~tvansteenburgh/charm-tools/ansible-template
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+224480@code.staging.launchpad.net

Description of the change

Added ansible template for 'charm create'.

To post a comment you must log in.
Revision history for this message
Whit Morriss (whitmo) wrote :

Example playbook should show all the available vars that get written by `apply_playbook` to `/etc/ansible/host_vars/localhost` (and maybe charmhelpers.contrib.ansible should document these too)

lp://staging/~tvansteenburgh/charm-tools/ansible-template updated
336. By Marco Ceppi

[tvansteenburgh] Fixed symlinks in python charm by using relative paths so that symlinks are copied properly when the charm is moved to it's final filesystem location.

337. By Marco Ceppi

[tvansteenburgh] Ensure *.pyc files are skipped during template processing.

338. By Tim Van Steenburgh

Fix charm-proof email validation

formataddr() will put quotes around a name component that
contains special chars. We need to remove those to accurately
compare against the original maintainer string.

Also fixes tests that were broken due to new files in
charmhelpers.core

339. By Tim Van Steenburgh

Remove option to symlink hooks when creating charm

340. By Tim Van Steenburgh

More helpful comments in playbook; update tests

Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

Per Whit's suggestion I updated the playbook comments to explicitly enumerate the available variables. Also updated tests to pass against current charmhelpers, and rebased against charmtools head.

Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM

Lets get this in charm-tools and start iterating on the output templates.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches