Merge "Add restore script for Maas DB"
diff --git a/maas/region.sls b/maas/region.sls
index 6dfc4dc..a27142d 100644
--- a/maas/region.sls
+++ b/maas/region.sls
@@ -177,7 +177,9 @@
- name: maas.process_subnets
- require:
- module: maas_config
+ {%- if region.get('fabrics', False) %}
- module: maas_fabrics
+ {%- endif %}
{%- endif %}
{%- if region.get('devices', False) %}
@@ -186,7 +188,9 @@
- name: maas.process_devices
- require:
- module: maas_config
+ {%- if region.get('subnets', False) %}
- module: maas_subnets
+ {%- endif %}
{%- endif %}
{%- if region.get('dhcp_snippets', False) %}
diff --git a/metadata/service/cluster/single.yml b/metadata/service/cluster/single.yml
index 5c91bd1..a307dcc 100644
--- a/metadata/service/cluster/single.yml
+++ b/metadata/service/cluster/single.yml
@@ -41,5 +41,5 @@
MA==
=dtMN
-----END PGP PUBLIC KEY BLOCK-----
- saltstack_repo_trusty: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/ trusty main"
- saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/ xenial main"
\ No newline at end of file
+ saltstack_repo_trusty: "http://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3/ trusty main"
+ saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/ xenial main"
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 29fb975..4ee4e0f 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -124,7 +124,7 @@
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+ [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}