summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/bundle_tpl/bundle.yaml3
-rw-r--r--ci/bundle_tpl/harelations.yaml33
-rw-r--r--ci/bundle_tpl/mysql.yaml2
-rw-r--r--ci/bundle_tpl/rabbitmq.yaml5
-rw-r--r--ci/bundle_tpl/relations.yaml135
5 files changed, 63 insertions, 115 deletions
diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index e02c6da5..62047fba 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -50,8 +50,7 @@ openstack-phase1:
{% endif %}
relations:
- - - "ntp:juju-info"
- - "nodes:juju-info"
+ - [ 'ntp:juju-info', 'nodes:juju-info' ]
{% if os.ha.mode == 'ha' %}
{% include 'harelations.yaml' %}
{% endif %}
diff --git a/ci/bundle_tpl/harelations.yaml b/ci/bundle_tpl/harelations.yaml
index e9405621..d82bb285 100644
--- a/ci/bundle_tpl/harelations.yaml
+++ b/ci/bundle_tpl/harelations.yaml
@@ -1,26 +1,15 @@
{% if os.ha.mode == 'ha' %}
- - - mysql:ha
- - hacluster-mysql:ha
- - - cinder:ha
- - hacluster-cinder:ha
- - - heat:ha
- - hacluster-heat:ha
- - - glance:ha
- - hacluster-glance:ha
- - - keystone:ha
- - hacluster-keystone:ha
- - - neutron-api:ha
- - hacluster-neutron:ha
- - - nova-cloud-controller:ha
- - hacluster-nova:ha
- - - openstack-dashboard:ha
- - hacluster-horizon:ha
- - - heat:ha
- - hacluster-heat:ha
- - - ceilometer:ha
- - hacluster-ceilometer:ha
+ - [ 'mysql:ha', 'hacluster-mysql:ha' ]
+ - [ 'cinder:ha', 'hacluster-cinder:ha' ]
+ - [ 'heat:ha', 'hacluster-heat:ha' ]
+ - [ 'glance:ha', 'hacluster-glance:ha' ]
+ - [ 'keystone:ha', 'hacluster-keystone:ha' ]
+ - [ 'neutron-api:ha', 'hacluster-neutron:ha' ]
+ - [ 'nova-cloud-controller:ha', 'hacluster-nova:ha' ]
+ - [ 'openstack-dashboard:ha', 'hacluster-horizon:ha' ]
+ - [ 'heat:ha', 'hacluster-heat:ha' ]
+ - [ 'ceilometer:ha', 'hacluster-ceilometer:ha' ]
{% if os.beta.hacluster_ceph_radosgw %}
- - - ceph-radosgw:ha
- - hacluster-ceph-radosgw:ha
+ - [ 'ceph-radosgw:ha', 'hacluster-ceph-radosgw:ha' ]
{% endif %}
{% endif %}
diff --git a/ci/bundle_tpl/mysql.yaml b/ci/bundle_tpl/mysql.yaml
index 6317608d..2c618b20 100644
--- a/ci/bundle_tpl/mysql.yaml
+++ b/ci/bundle_tpl/mysql.yaml
@@ -4,7 +4,7 @@
options:
innodb-buffer-pool-size: 2G
#lp1366997-workaround: true
- #max-connections: 20000
+ max-connections: 20000
root-password: {{ get_password('mysql_root') }}
sst-password: {{ get_password('mysql_sst') }}
{% if os.ha.mode == 'ha' %}
diff --git a/ci/bundle_tpl/rabbitmq.yaml b/ci/bundle_tpl/rabbitmq.yaml
index 35e07e90..d7f9c127 100644
--- a/ci/bundle_tpl/rabbitmq.yaml
+++ b/ci/bundle_tpl/rabbitmq.yaml
@@ -1,6 +1,11 @@
rabbitmq-server:
charm: "local:{{ ubuntu.release }}/rabbitmq-server"
num_units: {{ unit_qty() }}
+ options:
+{% if os.ha.mode == 'ha' %}
+ vip: {{ opnfv.vip.mysql }}
+ min-cluster-size: {{ unit_qty() }}
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml
index 690cdb01..69a3b978 100644
--- a/ci/bundle_tpl/relations.yaml
+++ b/ci/bundle_tpl/relations.yaml
@@ -1,93 +1,48 @@
- - - nova-compute:amqp
- - rabbitmq-server:amqp
- - - neutron-gateway:amqp
- - rabbitmq-server:amqp
- - - keystone:shared-db
- - mysql:shared-db
- - - nova-cloud-controller:identity-service
- - keystone:identity-service
- - - glance:identity-service
- - keystone:identity-service
- - - neutron-api:identity-service
- - keystone:identity-service
- - - neutron-api:shared-db
- - mysql:shared-db
- - - neutron-api:amqp
- - rabbitmq-server:amqp
- - - neutron-gateway:neutron-plugin-api
- - neutron-api:neutron-plugin-api
- - - glance:shared-db
- - mysql:shared-db
- - - glance:amqp
- - rabbitmq-server:amqp
- - - nova-cloud-controller:image-service
- - glance:image-service
- - - nova-compute:image-service
- - glance:image-service
- - - nova-cloud-controller:cloud-compute
- - nova-compute:cloud-compute
- - - nova-cloud-controller:amqp
- - rabbitmq-server:amqp
- - - nova-cloud-controller:quantum-network-service
- - neutron-gateway:quantum-network-service
- - - openstack-dashboard:identity-service
- - keystone:identity-service
- - - nova-cloud-controller:shared-db
- - mysql:shared-db
- - - nova-cloud-controller:neutron-api
- - neutron-api:neutron-api
- - - cinder:image-service
- - glance:image-service
- - - cinder:amqp
- - rabbitmq-server:amqp
- - - cinder:identity-service
- - keystone:identity-service
- - - cinder:cinder-volume-service
- - nova-cloud-controller:cinder-volume-service
- - - cinder-ceph:storage-backend
- - cinder:storage-backend
- - - ceph:client
- - nova-compute:ceph
- - - cinder:shared-db
- - mysql:shared-db
- - - ceph:client
- - cinder-ceph:ceph
- - - ceph:client
- - glance:ceph
- - - ceph-osd:mon
- - ceph:osd
- - - ntp:juju-info
- - nova-compute:juju-info
- - - ntp:juju-info
- - neutron-gateway:juju-info
- - - ceph-radosgw:mon
- - ceph:radosgw
- - - ceph-radosgw:identity-service
- - keystone:identity-service
- - - ceilometer:amqp
- - rabbitmq-server:amqp
- - - ceilometer-agent:ceilometer-service
- - ceilometer:ceilometer-service
- - - ceilometer:identity-service
- - keystone:identity-service
- - - ceilometer:identity-notifications
- - keystone:identity-notifications
- - - ceilometer-agent:nova-ceilometer
- - nova-compute:nova-ceilometer
- - - ceilometer:shared-db
- - mongodb:database
- - - heat:shared-db
- - mysql:shared-db
- - - heat:identity-service
- - keystone:identity-service
- - - heat:amqp
- - rabbitmq-server:amqp
- - - congress:shared-db
- - mysql:shared-db
- - - congress:identity-service
- - keystone:identity-service
- - - congress:amqp
- - rabbitmq-server:amqp
+ - [ 'nova-compute:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'neutron-gateway:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'keystone:shared-db', 'mysql:shared-db' ]
+ - [ 'nova-cloud-controller:identity-service', 'keystone:identity-service' ]
+ - [ 'glance:identity-service', 'keystone:identity-service' ]
+ - [ 'neutron-api:identity-service', 'keystone:identity-service' ]
+ - [ 'neutron-api:shared-db', 'mysql:shared-db' ]
+ - [ 'neutron-api:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ]
+ - [ 'glance:shared-db', 'mysql:shared-db' ]
+ - [ 'glance:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'nova-cloud-controller:image-service', 'glance:image-service' ]
+ - [ 'nova-compute:image-service', 'glance:image-service' ]
+ - [ 'nova-cloud-controller:cloud-compute', 'nova-compute:cloud-compute' ]
+ - [ 'nova-cloud-controller:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ]
+ - [ 'openstack-dashboard:identity-service', 'keystone:identity-service' ]
+ - [ 'nova-cloud-controller:shared-db', 'mysql:shared-db' ]
+ - [ 'nova-cloud-controller:neutron-api', 'neutron-api:neutron-api' ]
+ - [ 'cinder:image-service', 'glance:image-service' ]
+ - [ 'cinder:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'cinder:identity-service', 'keystone:identity-service' ]
+ - [ 'cinder:cinder-volume-service', 'nova-cloud-controller:cinder-volume-service' ]
+ - [ 'cinder-ceph:storage-backend', 'cinder:storage-backend' ]
+ - [ 'ceph:client', 'nova-compute:ceph' ]
+ - [ 'cinder:shared-db', 'mysql:shared-db' ]
+ - [ 'ceph:client', 'cinder-ceph:ceph' ]
+ - [ 'ceph:client', 'glance:ceph' ]
+ - [ 'ceph-osd:mon', 'ceph:osd' ]
+ - [ 'ntp:juju-info', 'nova-compute:juju-info' ]
+ - [ 'ntp:juju-info', 'neutron-gateway:juju-info' ]
+ - [ 'ceph-radosgw:mon', 'ceph:radosgw' ]
+ - [ 'ceph-radosgw:identity-service', 'keystone:identity-service' ]
+ - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ]
+ - [ 'ceilometer:identity-service', 'keystone:identity-service' ]
+ - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ]
+ - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ]
+ - [ 'ceilometer:shared-db', 'mongodb:database' ]
+ - [ 'heat:shared-db', 'mysql:shared-db' ]
+ - [ 'heat:identity-service', 'keystone:identity-service' ]
+ - [ 'heat:amqp', 'rabbitmq-server:amqp' ]
+ - [ 'congress:shared-db', 'mysql:shared-db' ]
+ - [ 'congress:identity-service', 'keystone:identity-service' ]
+ - [ 'congress:amqp', 'rabbitmq-server:amqp' ]
{% if os.lxd %}
- [ 'nova-compute:lxd', 'lxd:lxd' ]
{% endif %}