modified to use the local charms. 25/13725/2
authorNarinder Gupta <narinder.gupta@canonical.com>
Fri, 6 May 2016 14:16:05 +0000 (09:16 -0500)
committerNarinder Gupta <narinder.gupta@canonical.com>
Fri, 6 May 2016 14:18:25 +0000 (09:18 -0500)
Change-Id: I8d0d432ee48d234755a80400c77ae8fcaab90c46
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
ci/odl/juju-deployer/ovs-odl-ha.yaml
ci/odl/juju-deployer/ovs-odl-nonha.yaml
ci/odl/juju-deployer/ovs-odl-tip.yaml

index 95ec574..5600116 100644 (file)
@@ -21,7 +21,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     percona-cluster:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 3
       options:
         dataset-size: 2G
@@ -35,42 +35,42 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     hacluster-keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
 #    hacluster-heat:
-#      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+#      charm: "local:trusty/hacluster"
 #      options:
 #        corosync_key: |
 #          'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkxMikuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gOTYwKS4KUHJlc3Mga2V5cyBvbiB5b3VyIGtleWJvYXJkIHRvIGdlbmVyYX'
     hacluster-horizon:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
     hacluster-nova:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
     hacluster-neutron:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
     hacluster-glance:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
     hacluster-ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+      charm: "local:trusty/hacluster"
       options:
         corosync_key: |
           'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:trusty/ceilometer"
       num_units: 3
       options:
         vip: 10.4.1.14
@@ -80,14 +80,14 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       num_units: 3
       options:
         #vip: 10.4.1.18
@@ -97,7 +97,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     ceph:
-      branch: lp:~openstack-charmers/charms/trusty/ceph/next
+      charm: local:trusty/ceph
       num_units: 3
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -112,7 +112,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     ceph-osd:
-      branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
+      charm: local:trusty/ceph-osd
       num_units: 2
       options:
         osd-devices: /srv
@@ -122,7 +122,7 @@ openstack-phase2:
         - "nodes-compute=1"
 #        - "nodes-api=0"
     ceph-radosgw:
-      branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
+      charm: local:trusty/ceph-radosgw
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -130,7 +130,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: lp:~openstack-charmers/charms/trusty/cinder/next
+      charm: local:trusty/cinder
       num_units: 3
       options:
         block-device: None
@@ -142,16 +142,16 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     cinder-ceph:
-      branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+      charm: local:trusty/cinder-ceph
     rabbitmq-server:
-      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+      charm: local:trusty/rabbitmq-server
       num_units: 3
       to:
         - "lxc:nodes-api=2"
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     keystone:
-      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      charm: local:trusty/keystone
       num_units: 3
       options:
 #        ha-mcastport: 5402
@@ -164,7 +164,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     openstack-dashboard:
-      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      charm: local:trusty/openstack-dashboard
       num_units: 3
       options:
         secret: admin
@@ -175,7 +175,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=2"
     nova-compute:
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      charm: local:trusty/nova-compute
       num_units: 2
       options:
         enable-live-migration: true
@@ -189,7 +189,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     nova-cloud-controller:
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      charm: local:trusty/nova-cloud-controller
       num_units: 3
       options:
         console-access-protocol: novnc
@@ -203,7 +203,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=1"
     neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      charm: local:trusty/neutron-api
       num_units: 3
       options:
         neutron-security-groups: True
@@ -215,7 +215,7 @@ openstack-phase2:
         - "lxc:nodes-api=1"
         - "lxc:nodes-api=2"
     neutron-gateway:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+      charm: local:trusty/neutron-gateway
       options:
         #ext-port: "eth1"
         plugin: ovs-odl
@@ -223,7 +223,7 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
+      charm: local:trusty/odl-controller
       options:
         install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
         profile: "openvswitch-odl-beryllium"
@@ -232,7 +232,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=1"
     glance:
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      charm: local:trusty/glance
       num_units: 3
       options:
         vip: 10.4.1.12
@@ -248,12 +248,12 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=2"
     neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
+      charm: local:trusty/neutron-api-odl
       options:
         overlay-network-type: 'vxlan gre'
         security-groups: True
     openvswitch-odl:
-      branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
+      charm: local:trusty/openvswitch-odl
 #    haproxy:
 #      charm: cs:trusty/haproxy
 #      options:
index ee5ab66..9220f84 100644 (file)
@@ -21,7 +21,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services: 
     mysql: 
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 1
       options: 
         dataset-size: 2G
@@ -29,23 +29,23 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:trusty/ceilometer"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
         - "lxc:nodes-api=0"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      charm: "local:trusty/ceph"
       num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -59,7 +59,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=0"
     ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+      charm: "local:trusty/ceph-osd"
       num_units: 2
       options:
         osd-devices: /srv
@@ -68,7 +68,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+      charm: "local:trusty/ceph-radosgw"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -76,7 +76,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
+      charm: "local:trusty/cinder"
       num_units: 1
       options:
         block-device: None
@@ -85,14 +85,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
     rabbitmq-server: 
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
+      charm: "local:trusty/rabbitmq-server"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     keystone: 
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
+      charm: "local:trusty/keystone"
       num_units: 1
       options: 
 #        ha-mcastport: 5402
@@ -101,7 +101,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     openstack-dashboard: 
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
+      charm: "local:trusty/openstack-dashboard"
       num_units: 1
       options: 
         secret: admin
@@ -109,7 +109,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     nova-compute: 
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      charm: local:trusty/nova-compute
       num_units: 2
       options: 
         enable-live-migration: true
@@ -123,7 +123,7 @@ openstack-phase2:
 #        - "nodes-api=1"
 #        - "nodes-api=2"
     nova-cloud-controller: 
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      charm: local:trusty/nova-cloud-controller
       num_units: 1
       options: 
         console-access-protocol: novnc
@@ -131,7 +131,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api: 
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      charm: local:trusty/neutron-api
       num_units: 1
       options:
         neutron-security-groups: True
@@ -139,7 +139,7 @@ openstack-phase2:
       to: 
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+      charm: local:trusty/neutron-gateway
       options:
         #ext-port: "eth1"
         plugin: ovs-odl
@@ -147,7 +147,7 @@ openstack-phase2:
       to:  
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
+      charm: local:trusty/odl-controller
       options:
         install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
         profile: "openvswitch-odl-beryllium"
@@ -156,7 +156,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     glance: 
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      charm: local:trusty/glance
       num_units: 1
       to:
         - "lxc:nodes-api=0"
@@ -166,12 +166,12 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
+      charm: local:trusty/neutron-api-odl
       options:
         overlay-network-type: 'vxlan gre'
         security-groups: True
     openvswitch-odl:
-      branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
+      charm: local:trusty/openvswitch-odl
   relations:
     - - "neutron-api:neutron-plugin-api-subordinate"
       - "neutron-api-odl:neutron-plugin-api-subordinate"
index baa6d6c..8c309c5 100644 (file)
@@ -21,7 +21,7 @@ openstack-phase2:
   inherits: openstack-phase1
   services:
     mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+      charm: "local:trusty/percona-cluster"
       num_units: 1
       options:
         dataset-size: 2G
@@ -29,23 +29,23 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     ceilometer:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+      charm: "local:trusty/ceilometer"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     ceilometer-agent:
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+      charm: "local:trusty/ceilometer-agent"
     mongodb:
       charm: "cs:trusty/mongodb"
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
+      charm: "local:trusty/heat"
       to:
         - "lxc:nodes-api=0"
     ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
+      charm: "local:trusty/ceph"
       num_units: 2
       options:
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
@@ -59,7 +59,7 @@ openstack-phase2:
         - "lxc:nodes-api=0"
         - "lxc:nodes-api=0"
     ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+      charm: "local:trusty/ceph-osd"
       num_units: 1
       options:
         osd-devices: /srv
@@ -67,7 +67,7 @@ openstack-phase2:
       to:
         - "nodes-compute=0"
     ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+      charm: "local:trusty/ceph-radosgw"
       num_units: 1
       options:
         use-embedded-webserver: true
@@ -75,7 +75,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
+      charm: "local:trusty/cinder"
       num_units: 1
       options:
         block-device: None
@@ -85,14 +85,14 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+      charm: "local:trusty/cinder-ceph"
     rabbitmq-server:
-      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+      charm: local:trusty/rabbitmq-server
       num_units: 1
       to:
         - "lxc:nodes-api=0"
     keystone:
-      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      charm: local:trusty/keystone
       num_units: 1
       options:
         openstack-origin-git: include-file://keystone-master.yaml
@@ -101,7 +101,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     openstack-dashboard:
-      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      charm: local:trusty/openstack-dashboard
       num_units: 1
       options:
         openstack-origin-git: include-file://horizon-master.yaml
@@ -109,7 +109,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     nova-compute:
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      charm: local:trusty/nova-compute
       num_units: 2
       options:
         openstack-origin-git: include-file://nova-master.yaml
@@ -121,7 +121,7 @@ openstack-phase2:
         - "nodes-compute=0"
         - "nodes-compute=1"
     nova-cloud-controller:
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      charm: local:trusty/nova-cloud-controller
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
@@ -130,7 +130,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      charm: local:trusty/neutron-api
       num_units: 1
       options:
         neutron-security-groups: True
@@ -138,7 +138,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-gateway:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+      charm: local:trusty/neutron-gateway
       options:
         openstack-origin-git: include-file://neutron-master.yaml
         #ext-port: "eth1"
@@ -147,7 +147,7 @@ openstack-phase2:
       to:
         - "nodes-api=0"
     odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
+      charm: local:trusty/odl-controller
       options:
         install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
         profile: "openvswitch-odl-beryllium"
@@ -156,7 +156,7 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     glance:
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      charm: local:trusty/glance
       num_units: 1
       options:
         openstack-origin-git: include-file://glance-master.yaml
@@ -168,12 +168,12 @@ openstack-phase2:
       to:
         - "lxc:nodes-api=0"
     neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
+      charm: local:trusty/neutron-api-odl
       options:
         overlay-network-type: 'vxlan gre'
         security-groups: True
     openvswitch-odl:
-      branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
+      charm: local:trusty/openvswitch-odl
   relations:
     - - "neutron-api:neutron-plugin-api-subordinate"
       - "neutron-api-odl:neutron-plugin-api-subordinate"