configure the VIP accordingly and also change the sequence.

Remove the admin-openrc file.

Change-Id: I8a14dc6de22d0f0de346d69e6d02a7e9c295ece1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
(cherry picked from commit 0c50df832b79dc06fa44dfd918d78ceb894ffd64)

diff --git a/ci/clean.sh b/ci/clean.sh
index 211bcaa..a142ca7 100755 (executable)
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -28,6 +28,7 @@ if [[ "$jujuver" > "2" ]]; then
     rm -rf precise
     rm -rf trusty
     rm -rf xenial
+    rm -rf ~/joid_config/admin-openrc
     sleep 30
     sudo sysctl -w vm.drop_caches=3
 elif [ -d $HOME/.juju/environments ]; then

diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 8800f30..844ede6 100644 (file)
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -44,27 +44,15 @@ opnfv:
   units: {{ lab.racks[0].nodes|count }}
   vip:
 {% if opnfv.spaces_dict.public is defined %}
-{% if opnfv.spaces_dict.data is defined %}
-    ceilometer: {{ net_prefix }}24 {{ netdata_prefix }}24 {{ netpublic_prefix }}24
-    cinder: {{ net_prefix }}29 {{ netdata_prefix }}29 {{ netpublic_prefix }}29
-    dashboard: {{ net_prefix }}21 {{ netdata_prefix }}21 {{ netpublic_prefix }}21
-    glance: {{ net_prefix }}22 {{ netdata_prefix }}22 {{ netpublic_prefix }}22
-    heat: {{ net_prefix }}28 {{ netdata_prefix }}28 {{ netpublic_prefix }}28
-    keystone: {{ net_prefix }}23 {{ netdata_prefix }}23 {{ netpublic_prefix }}23
-    mysql: {{ net_prefix }}25
-    neutron: {{ net_prefix }}27 {{ netdata_prefix }}27 {{ netpublic_prefix }}27
-    nova: {{ net_prefix }}26 {{ netdata_prefix }}27 {{ netpublic_prefix }}26
-{% else %}
-    ceilometer: {{ net_prefix }}24 {{ netpublic_prefix }}24
-    cinder: {{ net_prefix }}29 {{ netpublic_prefix }}29
-    dashboard: {{ net_prefix }}21 {{ netpublic_prefix }}21
-    glance: {{ net_prefix }}22 {{ netpublic_prefix }}22
-    heat: {{ net_prefix }}28 {{ netpublic_prefix }}28
-    keystone: {{ net_prefix }}23 {{ netpublic_prefix }}23
+    ceilometer: {{ netpublic_prefix }}24 {{ net_prefix }}24 {{ netpublic_prefix }}24
+    cinder: {{ netpublic_prefix }}29 {{ net_prefix }}29
+    dashboard: {{ netpublic_prefix }}21 {{ net_prefix }}21
+    glance: {{ netpublic_prefix }}22 {{ net_prefix }}22
+    heat: {{ netpublic_prefix }}28 {{ net_prefix }}28
+    keystone: {{ netpublic_prefix }}23 {{ net_prefix }}23
     mysql: {{ net_prefix }}25
-    neutron: {{ net_prefix }}27 {{ netpublic_prefix }}27
-    nova: {{ net_prefix }}26 {{ netpublic_prefix }}26
-{% endif %}
+    neutron: {{ netpublic_prefix }}27 {{ net_prefix }}27
+    nova: {{ netpublic_prefix }}26 {{ net_prefix }}26
 {% else %}
     ceilometer: {{ net_prefix }}24
     cinder: {{ net_prefix }}29