Merge ~blake-rouse/maas:fix-venv-services into maas:master

[Blake Rouse]

Fix issues with running services and commands with the new venv.

[Alberto Donato (ack)]

+1 with a comment

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix-venv-services lp:~blake-rouse/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 51217cd0c875b9eb2c0c5c37502f1a88bfd3d2ed

review: Approve

649b3f0... by Blake Rouse on 2019-10-08

Remove the lazy import wrappers.

diff --git a/Makefile b/Makefile
index 33663e9..1948ed1 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,6 @@ export MAAS_ROOT := $(CURDIR)/.run
 # For things that care, postgresfixture for example, we always want to
 # use the "maas" databases.
 export PGDATABASE := maas
-# Don't perform permission/group checks in maas commands
-export MAAS_DEVENV := 1
 
 # Check if a command is found on PATH. Raise an error if not, citing
 # the package to install. Return the command otherwise.
@@ -77,7 +75,6 @@ build: \
   bin/test.parallel \
   bin/postgresfixture \
   bin/py \
-  bin/ipy \
   machine-resources \
   pycharm
 .PHONY: build
@@ -121,8 +118,8 @@ bin/flake8 bin/coverage \
 	mkdir -p bin
 	ln -sf ../$(VENV)/$@ $@
 
-bin/py bin/ipy:
-	ln -sf ../$(VENV)/$@thon $@
+bin/py:
+	ln -sf ../$(VENV)/bin/ipython $@
 
 # bin/flake8 is needed for checking lint and bin/node-sass is needed for
 # checking css.
diff --git a/services/regiond/run b/services/regiond/run
index 42e0c10..24c235e 100755
--- a/services/regiond/run
+++ b/services/regiond/run
@@ -27,6 +27,7 @@ fi
 export MAAS_DNS_CONFIG_DIR="$(readlink -f run/named)"
 export MAAS_DNS_RNDC_PORT=5246
 export MAAS_DNS_DEFAULT_CONTROLS=0
+export DJANGO_SETTINGS_MODULE="maasserver.djangosettings.development"
 
 # Exec the MAAS API and Web UI Server.
 script="$(readlink -f bin/regiond)"
diff --git a/src/maasserver/region_script.py b/src/maasserver/region_script.py
index 7bbc072..de9815d 100644
--- a/src/maasserver/region_script.py
+++ b/src/maasserver/region_script.py
@@ -4,6 +4,8 @@
 import grp
 import os
 
+from provisioningserver.config import is_dev_environment
+
 
 def check_user():
     # At present, only root should execute this.
@@ -58,7 +60,7 @@ def run_django(is_snap, is_devenv):
 
 def run():
     is_snap = 'SNAP' in os.environ
-    is_devenv = os.environ.get('MAAS_DEVENV') == '1'
+    is_devenv = is_dev_environment()
     if not is_devenv:
         check_user()
         if not is_snap:
diff --git a/src/provisioningserver/rack_script.py b/src/provisioningserver/rack_script.py
index 0dc0d6d..0a713d8 100644
--- a/src/provisioningserver/rack_script.py
+++ b/src/provisioningserver/rack_script.py
@@ -6,6 +6,8 @@ import os
 import pwd
 import sys
 
+from provisioningserver.config import is_dev_environment
+
 
 def check_users(users):
     """Check that the runnig user is in users."""
@@ -37,7 +39,7 @@ def set_umask():
 
 def run():
     is_snap = 'SNAP' in os.environ
-    is_devenv = os.environ.get('MAAS_DEVENV') == '1'
+    is_devenv = is_dev_environment()
 
     if not is_devenv:
         if is_snap: