← Back to branch summary

~larry-e-works/uci-engine/amqp-to-kombu

~larry-e-works/uci-engine/amqp-to-kombu

« back to all changes in this revision

Viewing changes to juju-deployer/configs/unit_config.yaml.tmpl

Committer: Larry Works
Date: 2014-09-30 18:08:31 UTC
mfrom: (762.1.55 uci-engine)
Revision ID: larry.works@canonical.com-20140930180831-cpztlnifhc47ah69

Massive merge from trunk, no conflicts.

files added:
britney_proxy

britney_proxy/britney

britney_proxy/britney/__init__.py

britney_proxy/britney/process_requests.py

britney_proxy/britney/process_results.py

britney_proxy/britney/tests

britney_proxy/britney/tests/__init__.py

britney_proxy/britney/tests/test_style.py

ci-utils/ci_utils/intercom.py

ci-utils/ci_utils/testing/data/testing_keyring.sec

ci-utils/ci_utils/tests/test_intercom.py

juju-deployer/britney-proxy.yaml.tmpl

nf-stats-service/nfss/tests/unit/test_api.py

nf-stats-service/web_static/graphs/app-startup.js

nf-stats-service/web_static/graphs/bootspeed.js

nf-stats-service/web_static/graphs/default.html

nf-stats-service/web_static/graphs/default.js

nf-stats-service/web_static/graphs/graphing.module.js

nf-stats-service/web_static/graphs/index.js

nf-stats-service/web_static/graphs/lrt.html

nf-stats-service/web_static/graphs/lrt.js

nf-stats-service/web_static/graphs/memevent.js

nf-stats-service/web_static/support.module.js

nf-stats-service/web_static/test/test.graphing.module.js

nf-stats-service/web_static/test/test.modifiers.js

ppa-creator/ppacreator/tests/test_create_ppa.py

tests/test_ppacreator.py

ticket_system/ticket/migrations/0012_add_source_arch.py

ticket_system/ticket/tests/test_user_info.py

webui/common/static/common/webui_login.js

webui/tickets/static/tickets/webui_create_ticket.js

webui/tickets/static/tickets/webuiforms.js

webui/tickets/templates/tickets/create.html

files removed:
nf-stats-service/web_static/graphs/lrt.html

files renamed:
ci-utils/ci_utils/testing/data/testing_keyring.txt => ci-utils/ci_utils/testing/data/testing_keyring.pub

nf-stats-service/nfss/nfss_insert.py => nf-stats-service/nfss_insert.py

files modified:
README

bin/bakery.py

bin/called-by-tarmac.py

bin/webui-collectstatic.py

branch-source-builder/bin/check_bsbuilder.py

branch-source-builder/bsbuilder/run_worker.py

branch-source-builder/bsbuilder/tests/__init__.py

branch-source-builder/bsbuilder/tests/test_upload.py

branch-source-builder/bsbuilder/tests/test_worker.py

branch-source-builder/bsbuilder/upload_package.py

charms/precise/wsgi-app/hooks/hooks.py

charms/precise/wsgi-app/hooks/intercom.py

charms/precise/wsgi-app/metadata.yaml

charms/precise/wsgi-app/unit_tests/test_hooks.py

ci-utils/ci_utils/data_store.py

ci-utils/ci_utils/file_handler.py

ci-utils/ci_utils/image_store/__init__.py

ci-utils/ci_utils/json_status.py

ci-utils/ci_utils/launchpad.py

ci-utils/ci_utils/setup_helper.py

ci-utils/ci_utils/testing/__init__.py

ci-utils/ci_utils/testing/features.py

ci-utils/ci_utils/tests/test_file_handler.py

ci-utils/ci_utils/unit_config.py

cli/ci_cli/image.py

cli/ci_cli/tests/test_cli.py

cli/ci_cli/tests/test_image.py

cli/ci_cli/tests/test_ticket.py

cli/ci_cli/ticket.py

cli/ci_cli/utils.py

debian/python3-nfss.install

docs/usage.rst

docs/using-lxc-for-local-development.rst

gatekeeper/gatekeeper/adapters/tests/test_sourcepackageupload.py

gatekeeper/gatekeeper/datastore/tests/test_ticket.py

gatekeeper/gatekeeper/datastore/ticket.py

juju-deployer/branch-source-builder.yaml.tmpl

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/configs/webui_http_vhost

juju-deployer/deploy.py

juju-deployer/gatekeeper.yaml.tmpl

juju-deployer/image-builder.yaml.tmpl

juju-deployer/lander.yaml.tmpl

juju-deployer/ppa-creator.yaml.tmpl

juju-deployer/publisher.yaml.tmpl

juju-deployer/relations.yaml

juju-deployer/test-runner.yaml.tmpl

juju-deployer/test_deploy.py

juju-deployer/ticket-system.yaml.tmpl

juju-deployer/validator.yaml.tmpl

lander/bin/lander_service_wrapper.py

lander/lander/run_worker.py

lander/lander/tests/test_service_wrapper.py

lander/lander/tests/test_ticket_api.py

lander/lander/ticket_api.py

nf-stats-service/README

nf-stats-service/nfss/__init__.py

nf-stats-service/nfss/api/v1.py

nf-stats-service/nfss/database.py

nf-stats-service/web_static/app.js

nf-stats-service/web_static/graphs/app-startup.html

nf-stats-service/web_static/graphs/bootspeed.html

nf-stats-service/web_static/graphs/memevent.html

nf-stats-service/web_static/index.html

nf-stats-service/web_static/test/index.html

nf-stats-service/web_static/test/mocks.js

nf-stats-service/web_static/test/test.js

ppa-creator/ppacreator/create_ppa.py

ppa-creator/ppacreator/run_worker.py

ppa-creator/ppacreator/tests/test_worker.py

test_runner/run-integration.py

test_runner/tstrun/testbed.py

test_runner/tstrun/tests/test_testbed.py

testing/run_tests.py

testing/venv.py

tests/test_cli.py

tests/test_image_store.py

tests/test_integration.py

tests/test_test_runner.py

tests/test_ticket_system.py

ticket_system/ticket/api.py

ticket_system/ticket/models.py

ticket_system/ticket/tests/__init__.py

ticket_system/ticket/tests/test_full_read_api.py

ticket_system/ticket/tests/test_models.py

ticket_system/ticket/tests/test_read_api.py

ticket_system/ticket_system/settings.py

ticket_system/ticket_system/urls.py

webui/common/static/common/webui.css

webui/common/templates/common/base.html

webui/tickets/static/tickets/webui.js

webui/tickets/static/tickets/webui_complete.js

webui/tickets/static/tickets/webui_failed.js

webui/tickets/static/tickets/webui_ticket_list.js

webui/tickets/urls.py

webui/tickets/views.py

webui/webui/settings.py

Show diffs side-by-side

added added

removed removed

juju-deployer/configs/unit_config.yaml.tmpl

16

16

glance_auth_password: $GLANCE_OS_PASSWORD

17

17

glance_auth_tenant_name: $GLANCE_OS_TENANT_NAME

18

18

glance_auth_region: $GLANCE_OS_REGION_NAME

19

ephemeral_cloud_net_id: $EPHEMERAL_CLOUD_NET_ID

19

20

20

21

21

22

keyring_uri: $CI_KEYRING_URI

Older »