1 files changed, 10 insertions, 14 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 8373b2bb..04ac2884 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -3,40 +3,36 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal-api
-        admin: internal-api
-        shared-db: internal-api
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
-{% else %}
-        public: internal-api
-{% endif %}
+        "": *oam-space
+        public: *public-space
+        admin: *admin-space
+        internal: *internal-space
+        shared-db: *internal-space
 {% endif %}
       options:
-        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        openstack-origin: *openstack-origin
 {% if os.git_repo.origin_git %}
         openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
-        region: {{ os.region }}
+        region: *openstack-region
         console-access-protocol: novnc
         neutron-external-network: ext-net
         service-guard: true
+        worker-multiplier: *worker-multiplier
+        single-nova-consoleauth: False
+        network-manager: Neutron
 {% if os.beta.public_api %}
         use-internal-endpoints: true
 {% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
-{% if os.api.worker_multiplier %}
-        worker-multiplier: {{ os.api.worker_multiplier }}
-{% endif %}
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.nova }}
 {% endif %}
 {% if opnfv.domain is defined %}
         #console-proxy-ip: {{ opnfv.domain }}
 {% endif %}
-        network-manager: Neutron
 {% if os.beta.public_api %}
         os-public-hostname: api.{{ opnfv.domain }}
 {% endif %}