diff options
| -rwxr-xr-x | ci/01-deploybundle.sh | 6 | ||||
| -rwxr-xr-x | ci/02-maasdeploy.sh | 4 | ||||
| -rwxr-xr-x | ci/deploy.sh | 9 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 5 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 5 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 5 | ||||
| l--------- | ci/ocl | 1 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 42 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 5 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 5 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-ha.yaml | 5 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-nonha.yaml | 5 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-tip.yaml | 5 | ||||
| l--------- | ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml | 1 | ||||
| l--------- | ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml | 1 | ||||
| l--------- | ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml | 1 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 5 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml | 5 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml | 5 |
19 files changed, 95 insertions, 25 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index dd6a32aa..8164c7e7 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -60,6 +60,12 @@ case "$3" in ;; esac +case "$5" in + 'ipv6' ) + sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml + ;; +esac + echo "... Deployment Started ...." case "$1" in 'nonha' ) diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index f7e1db29..e7155c26 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -179,9 +179,9 @@ case "$1" in ;; 'orangepod2' ) maas refresh - enableautomodebyname eth4 AUTO "192.168.22.0/24" compute || true + enableautomodebyname eth1 DHCP "192.168.2.0/24" compute || true enableautomodebyname eth5 AUTO "192.168.12.0/24" compute || true - enableautomodebyname eth2 AUTO "192.168.22.0/24" control || true + enableautomodebyname eth1 DHCP "192.168.2.0/24" control || true enableautomodebyname eth3 AUTO "192.168.12.0/24" control || true ;; 'attvirpod1' ) diff --git a/ci/deploy.sh b/ci/deploy.sh index 9c97b110..6005eb1d 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -10,6 +10,7 @@ opnfvtype=nonha openstack=liberty opnfvlab=default opnfvrel=b +opnfvfeature=odl_l2 read_config() { opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2` @@ -23,9 +24,10 @@ usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>] [-t <nonha|ha|tip>] [-o <juno|liberty>] [-l <default|intelpod5>] + [-f <ipv6|l2|l3|dvr>] [-r <a|b>]" 1>&2 exit 1; } -while getopts ":s:t:o:l:h:r:" opt; do +while getopts ":s:t:o:l:h:r:f:" opt; do case "${opt}" in s) opnfvsdn=${OPTARG} @@ -42,6 +44,9 @@ while getopts ":s:t:o:l:h:r:" opt; do r) opnfvrel=${OPTARG} ;; + f) + opnfvfeature=${OPTARG} + ;; h) usage ;; @@ -116,7 +121,7 @@ deploy() { ./00-bootstrap.sh #case default: - ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn + ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature } #check whether charms are still executing the code even juju-deployer says installed. diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 6d273c89..4740a676 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -85,6 +85,11 @@ openstack-phase2: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=2" keystone: charm: cs:trusty/keystone num_units: 3 diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index b7d127d1..85cf997c 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -75,6 +75,11 @@ openstack-phase2: ha-mcastport: 5402 to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" keystone: charm: cs:trusty/keystone num_units: 1 diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 25001c19..98d7ba7a 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -151,6 +151,11 @@ openstack-phase2: openstack-origin-git: include-file://glance-master.yaml to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" neutron-openvswitch: branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk options: @@ -0,0 +1 @@ +./opencontrail/
\ No newline at end of file diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 82efddd2..4860799e 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -35,32 +35,32 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" "hacluster-keystone": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' "hacluster-horizon": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' "hacluster-nova": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' "hacluster-neutron": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' "hacluster-glance": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' "hacluster-ceilometer": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' @@ -85,21 +85,21 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph: - charm: cs:trusty/ceph + branch: lp:~openstack-charmers/charms/trusty/ceph/next num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 - osd-reformat: 'no' + osd-reformat: 'false' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - "nodes-compute=0" - "nodes-compute=1" ceph-osd: - charm: cs:trusty/ceph-osd + branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next num_units: 1 options: osd-devices: /srv @@ -107,7 +107,7 @@ openstack-phase2: to: - "nodes-api=1" ceph-radosgw: - charm: cs:trusty/ceph-radosgw + branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next num_units: 1 options: use-embedded-webserver: true @@ -115,7 +115,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" cinder: - charm: cs:trusty/cinder + branch: lp:~openstack-charmers/charms/trusty/cinder/next num_units: 3 options: block-device: None @@ -126,16 +126,16 @@ openstack-phase2: - "lxc:nodes-api=0" - "lxc:nodes-api=2" cinder-ceph: - charm: cs:trusty/cinder-ceph + branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next num_units: 3 to: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" "keystone": - branch: lp:charms/trusty/keystone + branch: lp:~openstack-charmers/charms/trusty/keystone/next num_units: 3 options: # ha-mcastport: 5402 @@ -147,7 +147,7 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=2" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next num_units: 3 options: secret: admin @@ -170,7 +170,7 @@ openstack-phase2: # - "nodes-api=1" # - "nodes-api=2" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next num_units: 3 options: "console-access-protocol": novnc @@ -194,7 +194,7 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=2" neutron-gateway: - branch: lp:charms/trusty/neutron-gateway + branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: # "ext-port": "eth1" plugin: ovs-odl @@ -212,7 +212,7 @@ openstack-phase2: to: - "lxc:nodes-api=1" "glance": - branch: lp:charms/trusty/glance + branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 3 options: vip: 10.4.1.12 @@ -345,7 +345,7 @@ trusty-liberty-nodes: trusty-liberty: inherits: openstack-phase2 overrides: - cluster_count: 3 +# cluster_count: 3 #os-data-network: 10.4.8.0/21 #prefer-ipv6: true region: Canonical @@ -364,7 +364,7 @@ trusty-kilo-nodes: trusty-kilo: inherits: openstack-phase2 overrides: - cluster_count: 3 +# cluster_count: 3 #os-data-network: 10.4.8.0/21 #prefer-ipv6: true region: Canonical @@ -383,7 +383,7 @@ trusty-juno-nodes: trusty-juno: inherits: openstack-phase2 overrides: - cluster_count: 3 +# cluster_count: 3 #os-data-network: 10.4.8.0/21 #prefer-ipv6: true region: Canonical diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index f478cec9..3511c929 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -158,6 +158,11 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" neutron-api-odl: branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp options: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index f79fb4ce..341f59ac 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -161,6 +161,11 @@ openstack-phase2: openstack-origin-git: include-file://glance-master.yaml to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" neutron-api-odl: branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp options: diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index c58501a3..77e42013 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -218,6 +218,11 @@ openstack-phase2: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=2" neutron-api-onos: branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" options: diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 136e774b..28983bbe 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml @@ -152,6 +152,11 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" neutron-api-onos: branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" options: diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index 35d56597..11ff4717 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -156,6 +156,11 @@ openstack-phase2: openstack-origin-git: include-file://glance-master.yaml to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" neutron-api-onos: branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" options: diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml new file mode 120000 index 00000000..819993bd --- /dev/null +++ b/ci/opencontrail/juju-deployer/ovs-ocl-ha.yaml @@ -0,0 +1 @@ +ovs-opencontrail-ha.yaml
\ No newline at end of file diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml new file mode 120000 index 00000000..dc2ea145 --- /dev/null +++ b/ci/opencontrail/juju-deployer/ovs-ocl-nonha.yaml @@ -0,0 +1 @@ +ovs-opencontrail-nonha.yaml
\ No newline at end of file diff --git a/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml b/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml new file mode 120000 index 00000000..509bf6cc --- /dev/null +++ b/ci/opencontrail/juju-deployer/ovs-ocl-tip.yaml @@ -0,0 +1 @@ +ovs-opencontrail-tip.yaml
\ No newline at end of file diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 90b85f68..b6996d7f 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -221,6 +221,11 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=0" - "lxc:nodes-api=2" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=2" relations: - [ "glance:ha", "hacluster-glance:ha" ] - [ "keystone:ha", "hacluster-keystone:ha" ] diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml index 503fb775..5e01c495 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml @@ -143,6 +143,11 @@ openstack-phase2: num_units: 1 to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" relations: - [ keystone, mysql ] - [ nova-cloud-controller, mysql ] diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml index 51ce5d10..6e1f700d 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml @@ -149,6 +149,11 @@ openstack-phase2: openstack-origin-git: include-file://glance-master.yaml to: - "lxc:nodes-api=0" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: + - "lxc:nodes-api=0" relations: - [ keystone, mysql ] - [ nova-cloud-controller, mysql ] |