modified to change the cluster count for rabbitmq and relation. 67/16467/2
authorNarinder Gupta <narinder.gupta@canonical.com>
Wed, 6 Jul 2016 16:52:29 +0000 (11:52 -0500)
committerNarinder Gupta <narinder.gupta@canonical.com>
Wed, 6 Jul 2016 16:59:47 +0000 (11:59 -0500)
Change-Id: I6c23b7f5c6387b94cda505284612018dddd9e245
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
ci/bundle_tpl/bundle.yaml
ci/bundle_tpl/harelations.yaml
ci/bundle_tpl/mysql.yaml
ci/bundle_tpl/rabbitmq.yaml
ci/bundle_tpl/relations.yaml

index e02c6da..62047fb 100644 (file)
@@ -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 %}
index e940562..d82bb28 100644 (file)
@@ -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 %}
index 6317608..2c618b2 100644 (file)
@@ -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' %}
index 35e07e9..d7f9c12 100644 (file)
@@ -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 }}"
index 690cdb0..69a3b97 100644 (file)
@@ -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 %}