Merge lp://staging/~doanac/ubuntu-ci-services-itself/deploy-with-oauth-tokens into lp://staging/ubuntu-ci-services-itself

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 239
Merged at revision: 248
Proposed branch: lp://staging/~doanac/ubuntu-ci-services-itself/deploy-with-oauth-tokens
Merge into: lp://staging/ubuntu-ci-services-itself
Diff against target: 45 lines (+17/-7)
2 files modified
juju-deployer/configs/unit_config.yaml.tmpl (+4/-4)
juju-deployer/deploy.py (+13/-3)
To merge this branch: bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/deploy-with-oauth-tokens
Reviewer Review Type Date Requested Status
Evan (community) Approve
Vincent Ladeuil (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+206283@code.staging.launchpad.net

Commit message

deploy: move oauth defaults into cheetah

We need a mechanism to properly set the oauth defaults in our unit-config
file. The way we might do this could vary. For example you could do
things like:

 * add these OAUTH values to the novarc file you source
 * provide CLI args in deploy.py

However, regardless of that decision we'll still have to pass them
as environment variables to cheetah for it to fill out the template.
This is step one in that process.

Description of the change

deploy: move oauth defaults into cheetah

for the time being, I've added my oauth tokens from:

  <https://bazaar.launchpad.net/~ci-engineering-private/ci-engineering-canonistack/trunk/view/head:/juju-deployer/ci-airline.yaml>

to my ~/.canonistack/novarc_lcy01 file and now have deployments "just work".

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:239
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/153/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/153/rebuild

review: Approve (continuous-integration)
Revision history for this message
Vincent Ladeuil (vila) wrote :

I think we should stay with what we've done so far, so env vars would have my preference.

If you could either add a check where we already check for OS_USERNAME, that would be helpful.

Failing that, mentioning it in the README will help those with a bad memory ;)

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

On 02/19/2014 10:29 AM, Vincent Ladeuil wrote:
> Failing that, mentioning it in the README will help those with a bad memory;)

yeah. that was what i wanted to look at today. I want to create
something that explains how to set up an environment for a full
production-ready deployment today.

Revision history for this message
Chris Johnston (cjohnston) wrote :
Download full text (25.6 KiB)

The attempt to merge lp:~doanac/ubuntu-ci-services-itself/deploy-with-oauth-tokens into lp:ubuntu-ci-services-itself failed. Below is the output from the failed tests.

New python executable in /tmp/tmp.lmYCq4Kliv/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
== Testing ci-utils ....
Downloading/unpacking python-swiftclient==1.8.0
  Running setup.py egg_info for package python-swiftclient

    Installed /tmp/tmp.lmYCq4Kliv/build/python-swiftclient/pbr-0.6-py2.7.egg
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no files found matching '*' under directory 'tools'
Downloading/unpacking simplejson>=2.0.9 (from python-swiftclient==1.8.0)
  Running setup.py egg_info for package simplejson

Installing collected packages: python-swiftclient, simplejson
  Running setup.py install for python-swiftclient
    [pbr] Reusing existing SOURCES.txt
    changing mode of build/scripts-2.7/swift from 664 to 775
    changing mode of /tmp/tmp.lmYCq4Kliv/bin/swift to 775
  Running setup.py install for simplejson
    building 'simplejson._speedups' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c simplejson/_speedups.c -o build/temp.linux-x86_64-2.7/simplejson/_speedups.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro build/temp.linux-x86_64-2.7/simplejson/_speedups.o -o build/lib.linux-x86_64-2.7/simplejson/_speedups.so

Successfully installed python-swiftclient simplejson
Cleaning up...
Downloading/unpacking python-glanceclient==0.12.0
  Running setup.py egg_info for package python-glanceclient

    Installed /tmp/tmp.lmYCq4Kliv/build/python-glanceclient/pbr-0.6-py2.7.egg
    [pbr] Excluding argparse: Python 2.6 only dependency
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
Downloading/unpacking pbr>=0.5.21,<1.0 (from python-glanceclient==0.12.0)
  Running setup.py egg_info for package pbr
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in ...

Revision history for this message
Evan (ev) wrote :

Looks good! Thanks for this.

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