summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml2
-rw-r--r--ci/genMAASConfig.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
index 9eb02f9a..e4607993 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -35,7 +35,7 @@
vip: {{ opnfv.vip.nova }}
{% endif %}
{% if opnfv.domain is defined %}
- console-proxy-ip: {{ opnfv.domain }}
+ #console-proxy-ip: {{ opnfv.domain }}
{% endif %}
network-manager: Neutron
{% if os.beta.public_api %}
diff --git a/ci/genMAASConfig.py b/ci/genMAASConfig.py
index c3bc92f0..9417f71c 100644
--- a/ci/genMAASConfig.py
+++ b/ci/genMAASConfig.py
@@ -36,9 +36,9 @@ labconfig_file = options.lab
jujuver = subprocess.check_output(["juju", "--version"])
if LooseVersion(jujuver) >= LooseVersion('2'):
- TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas_tpl'
-else:
TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas2/maas_tpl'
+else:
+ TPL_DIR = os.path.dirname(os.path.abspath(__file__))+'/config_tpl/maas_tpl'
HOME = os.environ['HOME']
USER = os.environ['USER']