Minor fixes to help integration of CORD-912
Change-Id: I8dd69bf2eae091ca60bbbfbfebce465405662a58
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index 4f1bb7c..22713e2 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -16,6 +16,7 @@
xos_users: []
use_vtn: True
+use_fabric: True
xos_tosca_config_templates:
- openstack.yaml
@@ -30,12 +31,6 @@
xos_other_templates:
- fabric-network-cfg.json
-cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
-
-xos_docker_volumes:
- - host: "{{ cord_profile_dir }}/images"
- container: /opt/xos/images
-
# GUI branding [OLD GUI to be removed]
gui_branding_name: "CORD"
gui_branding_icon: "/static/cord-logo.png"
@@ -150,12 +145,6 @@
juju_config_path: /usr/local/src/juju_config.yml
-# Pull ONOS from local Docker registry rather than Docker Hub
-onos_docker_image: "docker-registry:5000/onosproject/onos:candidate"
-
-# Pull XOS from local Docker registry
-xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
-
keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
deployment_flavors:
@@ -165,12 +154,11 @@
- m1.xlarge
charm_versions:
- ceilometer: "cs:trusty/ceilometer-17"
ceilometer-agent: "cs:trusty/ceilometer-agent-13"
+ ceilometer: "cs:trusty/ceilometer-17"
glance: "cs:trusty/glance-28"
keystone: "cs:trusty/keystone-33"
mongodb: "cs:trusty/mongodb-33"
- percona-cluster: "cs:trusty/percona-cluster-31"
nagios: "cs:trusty/nagios-10"
neutron-api: "cs:~cordteam/trusty/neutron-api-5"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
@@ -178,6 +166,7 @@
nrpe: "cs:trusty/nrpe-4"
ntp: "cs:trusty/ntp-14"
openstack-dashboard: "cs:trusty/openstack-dashboard-19"
+ percona-cluster: "cs:trusty/percona-cluster-31"
rabbitmq-server: "cs:trusty/rabbitmq-server-42"
head_vm_list: []