From c64f24e26c24772f2a4a64ddb75c8e2855ed2a76 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 3 May 2016 14:39:14 -0500 Subject: cleanup and also fetch the charms first then deploy. Change-Id: I7e9b2995ec7c32079903a3c8db0b2bd54a6e724e Signed-off-by: Narinder Gupta --- ci/nosdn/fetch-charms.sh | 37 +++++++++++++--------- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 48 ++++++++++++++--------------- ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 38 +++++++++++------------ ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 38 +++++++++++------------ 4 files changed, 84 insertions(+), 77 deletions(-) (limited to 'ci/nosdn') diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index 3cf269c2..1c1074ed 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -1,19 +1,26 @@ #!/bin/sh -ex -mkdir -p src/charms/trusty +distro=trusty +mkdir -p $distro # openstack -bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next -bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next -bzr branch lp:~sdn-charmers/charms/trusty/neutron-api/odl src/charms/trusty/neutron-api-odl -bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next -bzr branch lp:~sdn-charmers/charms/trusty/nova-compute/odl src/charms/trusty/nova-compute-odl -bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next -bzr branch lp:~sdn-charmers/charms/trusty/quantum-gateway/odl src/charms/trusty/quantum-gateway-odl - -# opendaylight -bzr branch lp:~sdn-charmers/charms/trusty/odl-controller/trunk src/charms/trusty/odl-controller -bzr branch lp:~sdn-charmers/charms/trusty/neutron-odl/trunk src/charms/trusty/neutron-odl - -mkdir -p charms/trusty -(cd charms/trusty; ln -s ../../src/charms/trusty/* .) +bzr branch lp:~openstack-charmers/charms/$distro/ceilometer/next $distro/ceilometer +bzr branch lp:~openstack-charmers/charms/$distro/ceilometer-agent/next $distro/ceilometer-agent +bzr branch lp:~openstack-charmers/charms/$distro/ceph/next $distro/ceph +bzr branch lp:~openstack-charmers/charms/$distro/ceph-osd/next $distro/ceph-osd +bzr branch lp:~openstack-charmers/charms/$distro/ceph-radosgw/next $distro/ceph-radosgw +bzr branch lp:~openstack-charmers/charms/$distro/cinder/next $distro/cinder +bzr branch lp:~openstack-charmers/charms/$distro/cinder-ceph/next $distro/cinder-ceph +bzr branch lp:~openstack-charmers/charms/$distro/glance/next $distro/glance +bzr branch lp:~narindergupta/charms/$distro/promise/trunk $distro/promise +bzr branch lp:~openstack-charmers/charms/$distro/keystone/next $distro/keystone +bzr branch lp:~openstack-charmers/charms/$distro/percona-cluster/next $distro/percona-cluster +bzr branch lp:~openstack-charmers/charms/$distro/neutron-api/next $distro/neutron-api +bzr branch lp:~openstack-charmers/charms/$distro/neutron-gateway/next $distro/neutron-gateway +bzr branch lp:~openstack-charmers/charms/$distro/neutron-openvswitch/next $distro/neutron-openvswitch +bzr branch lp:~openstack-charmers/charms/$distro/nova-cloud-controller/next $distro/nova-cloud-controller +bzr branch lp:~openstack-charmers/charms/$distro/nova-compute/next $distro/nova-compute +bzr branch lp:~openstack-charmers/charms/$distro/openstack-dashboard/next $distro/openstack-dashboard +bzr branch lp:~openstack-charmers/charms/$distro/rabbitmq-server/next $distro/rabbitmq-server +bzr branch lp:~openstack-charmers/charms/$distro/hacluster/next $distro/hacluster +bzr branch lp:~openstack-charmers/charms/$distro/heat/next $distro/heat diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 8df30b26..1ce07c93 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -21,16 +21,16 @@ openstack-phase2: inherits: openstack-phase1 services: ceilometer: - branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + charm: "local:trusty/ceilometer" num_units: 3 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" ceilometer-agent: - branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" + charm: "local:trusty/ceilometer-agent" ceph: - branch: "lp:~openstack-charmers/charms/trusty/ceph/next" + charm: "local:trusty/ceph" num_units: 3 options: monitor-count: 3 @@ -45,7 +45,7 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=1" ceph-osd: - branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" + charm: "local:trusty/ceph-osd" num_units: 2 options: osd-devices: /srv @@ -54,7 +54,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 @@ -62,7 +62,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 @@ -73,10 +73,10 @@ 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" num_units: 0 glance: - branch: "lp:~openstack-charmers/charms/trusty/glance/next" + charm: "local:trusty/glance" num_units: 3 options: ha-mcastport: 5402 @@ -86,12 +86,12 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=1" opnfv-promise: - branch: lp:~narindergupta/charms/trusty/promise/trunk + charm: local:trusty/promise num_units: 1 to: - "lxc:nodes-api=2" keystone: - branch: "lp:~openstack-charmers/charms/trusty/keystone/next" + charm: "local:trusty/keystone" num_units: 3 options: admin-password: openstack @@ -108,7 +108,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" mysql: - branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" + charm: "local:trusty/percona-cluster" num_units: 3 options: max-connections: 20000 @@ -121,7 +121,7 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" neutron-api: - branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next" + charm: "local:trusty/neutron-api" num_units: 3 options: neutron-security-groups: true @@ -131,7 +131,7 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=1" neutron-gateway: - branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" + charm: "local:trusty/neutron-gateway" num_units: 1 options: #ext-port: "eth1" @@ -139,10 +139,10 @@ openstack-phase2: to: - "nodes-api=0" neutron-openvswitch: - branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next" + charm: "local:trusty/neutron-openvswitch" num_units: 0 nova-cloud-controller: - branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" + charm: "local:trusty/nova-cloud-controller" num_units: 3 options: network-manager: Neutron @@ -153,7 +153,7 @@ openstack-phase2: - "lxc:nodes-api=1" - "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 @@ -167,7 +167,7 @@ openstack-phase2: # - "nodes-api=1" # - "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 @@ -178,38 +178,38 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" 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" heat: - branch: "lp:~openstack-charmers/charms/trusty/heat/next" + charm: "local:trusty/heat" to: - "lxc:nodes-api=0" hacluster-keystone: - branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" + charm: "local:trusty/hacluster" options: corosync_key: | 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' 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=' diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index 41d218d4..1c2961ef 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -21,14 +21,14 @@ openstack-phase2: inherits: openstack-phase1 services: ceilometer: - branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + charm: "local:charms/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" ceph: - branch: "lp:~openstack-charmers/charms/trusty/ceph/next" + charm: "local:trusty/ceph" num_units: 2 options: monitor-count: 2 @@ -42,7 +42,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 @@ -51,7 +51,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 @@ -59,7 +59,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 @@ -68,22 +68,22 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder-ceph: - branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" + charm: "local:trusty/cinder-ceph" num_units: 0 glance: - branch: "lp:~openstack-charmers/charms/trusty/glance/next" + charm: "local:trusty/glance" num_units: 1 options: ha-mcastport: 5402 to: - "lxc:nodes-api=0" opnfv-promise: - branch: lp:~narindergupta/charms/trusty/promise/trunk + charm: local:trusty/promise 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: admin-password: openstack @@ -97,14 +97,14 @@ openstack-phase2: to: - "lxc:nodes-api=0" mysql: - branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" + charm: "local:trusty/percona-cluster" num_units: 1 options: max-connections: 20000 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 @@ -112,7 +112,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-gateway: - branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" + charm: "local:trusty/neutron-gateway" num_units: 1 options: instance-mtu: 1400 @@ -120,17 +120,17 @@ openstack-phase2: to: - "nodes-api=0" neutron-openvswitch: - branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next" + charm: "local:trusty/neutron-openvswitch" num_units: 0 nova-cloud-controller: - branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" + charm: "local:trusty/nova-cloud-controller" num_units: 1 options: network-manager: Neutron 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 @@ -144,7 +144,7 @@ openstack-phase2: # - "nodes-api=1" # - "nodes-api=2" openstack-dashboard: - branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" + charm: "local:trusty/openstack-dashboard" num_units: 1 options: secret: admin @@ -152,12 +152,12 @@ openstack-phase2: to: - "lxc:nodes-api=0" rabbitmq-server: - branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" + charm: "local:trusty/rabbitmq-server" 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" relations: diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index a5b6cef8..44cb57a9 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -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 @@ -86,14 +86,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 @@ -102,7 +102,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 @@ -110,7 +110,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 @@ -122,7 +122,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 @@ -131,7 +131,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-api: - branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + charm: local:charms/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: openstack-origin-git: include-file://neutron-master.yaml instance-mtu: 1400 @@ -147,19 +147,19 @@ openstack-phase2: to: - "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 to: - "lxc:nodes-api=0" opnfv-promise: - branch: lp:~narindergupta/charms/trusty/promise/trunk + charm: local:trusty/promise num_units: 1 to: - "lxc:nodes-api=0" neutron-openvswitch: - branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next" + charm: "local:trusty/neutron-openvswitch" options: openstack-origin-git: include-file://neutron-master.yaml relations: -- cgit 1.2.3-korg