Merge lp://staging/~kelvin.li/rnr-server/charm-supports into lp://staging/rnr-server

Thanks for the reviews, had made the modification.

On Thu, Apr 30, 2015 at 3:12 AM, Ricardo Kirkner <
<email address hidden>> wrote:

>
>
> Diff comments:
>
> > === modified file '.bzrignore'
> > --- .bzrignore 2014-07-24 17:56:54 +0000
> > +++ .bzrignore 2015-04-29 05:44:33 +0000
> > @@ -35,3 +35,5 @@
> > django_project/scaclient.py
> > django_project/txstatsd
> > django_project/django_configglue
> > +.idea/
>
> we'd rather not pollute our projects with tool-specific ignore rules
>
> Removed.

> > +*.pyc
> >
> > === modified file 'Makefile'
> > --- Makefile 2014-10-28 16:11:23 +0000
> > +++ Makefile 2015-04-29 05:44:33 +0000
> > @@ -1,21 +1,36 @@
> > +#!/usr/bin/make
> > CM = /usr/lib/config-manager/cm.py
> > PYTHON := $(shell which python)
> > CM_TMP_CONFIG = config-manager.txt.tmp
> > +CM_TMP_SETTING_CONFIG = config-manager.txt.setting.tmp
>
> where is this being used?
>
> Old var that was used before, now it's uselses.

> >
> > HERE := $(shell pwd)
> > PYTHONPATH := ${HERE}/src:${HERE}/lib:${PYTHONPATH}
> > -
> > -export PYTHONPATH
> > DJANGO_SETTINGS_MODULE ?= django_project.settings
> > -export DJANGO_SETTINGS_MODULE
> >
> > VIRTUALENV = virtualenv
> > VIRTUALENV_DIR ?= ./virtualenv
> > +VIRTUALENV_BIN := ${VIRTUALENV_DIR}/bin
> > VIRTUALENV_ARGS ?= --distribute --clear --system-site-packages
> >
> > LOCAL_SETTINGS_DIR = ../local_config
> > LOCAL_SETTINGS_PATH := ${LOCAL_SETTINGS_DIR}/settings.py
> >
> > +JUJU_ENV ?= local
> > +JUJU_REPO ?= ../.juju-repo
> > +PROJECT_NAME = rnr-server
> > +
> > +# Create archives in labelled directories (ie. r27/$(PROJECT_NAME).tbz2)
> > +TARBALL_BUILD_LABEL ?= r$(shell bzr revno)
> > +TARBALL_FILE_NAME = $(PROJECT_NAME).tbz2
> > +TARBALL_BUILDS_DIR ?= $(JUJU_REPO)/builds
> > +TARBALL_BUILD_DIR = $(TARBALL_BUILDS_DIR)/$(TARBALL_BUILD_LABEL)
> > +TARBALL_BUILD_PATH = $(TARBALL_BUILD_DIR)/$(TARBALL_FILE_NAME)
> > +
> > +
> > +export PYTHONPATH
> > +export DJANGO_SETTINGS_MODULE
> > +
> > local-config:
> > @if test ! -e $(LOCAL_SETTINGS_PATH); then \
> > mkdir -p $(LOCAL_SETTINGS_DIR); \
> > @@ -23,11 +38,8 @@
> > echo 'Generated devel local settings.'; \
> > fi;
> >
> > -sanitize-sourcedeps:
> > - sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/
> bazaar.launchpad.net/g' config-manager.txt > $(CM_TMP_CONFIG)
> > -
> > virtualenv:
> > - @if test ! -e $(VIRTUALENV_DIR); then \
> > + @if test ! -e $(VIRTUALENV_DIR); ! -e $(VIRTUALENV_BIN); then \
> > $(VIRTUALENV) $(VIRTUALENV_DIR) $(VIRTUALENV_ARGS); \
> > fi;
> >
> > @@ -37,11 +49,43 @@
> > install-virtualenv-requirements: virtualenv
> > $(VIRTUALENV_DIR)/bin/pip install -r requirements.txt
> >
> > -sourcedeps: sanitize-sourcedeps
> > +
> > +version:
> > + bzr version-info --format=python > lib/versioninfo.py
> > +
> > +
> > +#Dependencies
> > +sanitize-sourcedeps:
> > + sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/
> bazaar.launchpad.net/g' config-manager.txt > $(CM_TMP_CONFIG)
> > +
> > +build:
> > $(CM) update $(CM_TMP_CONFIG)
> > +
> > +branches/last_build: config-manager.txt
> > + $(MAKE) san...

minor modification with review feedback.
- removed the tool-specific ignore item in bzrignroe file
- removed the generated versioninfo.py
- removed the unnecessary blanks

LGTM

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Approve, 1 Resubmit.