modfiied to not to expose api on admin network if public is not

defined.

Change-Id: I3f8a79de2cb85d0273bdfd4d8b21e1eb7a7a4979
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
index 1349ad2..6abc6d7 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
@@ -5,15 +5,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index c3cec5c..644de69 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -10,14 +10,15 @@
       bindings:
         shared-db: internal-api
         internal: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
+        admin: internal-api
         public: internal-api
 {% endif %}
 {% endif %}

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 779d2c4..2d9ffbe 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -106,15 +106,16 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index 268563c..d350edc 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -9,15 +9,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/congress.yaml b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
index 4800e58..e9a549d 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
@@ -5,15 +5,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index c57260c..a34a0f0 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -5,15 +5,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/heat.yaml b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
index c1f2358..5e03b1f 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
@@ -5,15 +5,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index fc688b7..06499b4 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -5,15 +5,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
index fdd732c..30cc405 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/mysql.yaml
@@ -8,7 +8,7 @@
 {% endif %}
       options:
 {% if os.ha.mode == 'ha' %}
-        innodb-buffer-pool-size: 10G
+        innodb-buffer-pool-size: 1G
 {% else %}
         innodb-buffer-pool-size: 1G
 {% endif %}

diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index fa15dd8..72ad0bb 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -5,15 +5,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

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 e460799..2f21edf 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -5,15 +5,16 @@
       bindings:
         internal: internal-api
         shared-db: internal-api
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
 {% if opnfv.spaces_dict.data is defined %}
         admin: admin-api
 {% else %}
         admin: internal-api
 {% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
 {% else %}
         public: internal-api
+        admin: internal-api
 {% endif %}
 {% endif %}
       options:

diff --git a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
index fc64eb8..a50c242 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
@@ -1,5 +1,5 @@
     openbaton:
-      charm: "./{{ ubuntu.release }}/openbaton"
+      charm: "./trusty/openbaton"
       num_units: 1
       to:
         - "lxd:nodes/0"