diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/02-maasdeploy.sh | 28 | ||||
| -rwxr-xr-x | ci/nosdn/01-deploybundle.sh | 15 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 9 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-tip.yaml | 5 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs.yaml | 5 | ||||
| -rwxr-xr-x | ci/odl/01-deploybundle.sh | 15 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 9 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 5 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 5 | ||||
| -rw-r--r-- | ci/onos/01-deploybundle.sh | 21 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/onos-ha.yaml | 9 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/onos-tip.yaml | 5 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/onos.yaml | 5 | ||||
| -rwxr-xr-x | ci/opencontrail/01-deploybundle.sh | 15 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 9 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-tip.yaml | 5 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail.yaml | 5 |
17 files changed, 65 insertions, 105 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index dedd56cc..3284c3ba 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -78,13 +78,27 @@ fi #Below function will mark the interfaces in Auto mode to enbled by MAAS enableautomode() { listofnodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4` - for nodes in $listofnodes do maas maas interface link-subnet $nodes $1 mode=$2 subnet=$3 done } +#Below function will mark the interfaces in Auto mode to enbled by MAAS +# using hostname of the node added into MAAS + +enableautomodebyname() { + if [ ! -z "$4" ]; then + for i in `seq 1 7`; + do + nodes=`maas maas nodes list hostname=node$i-$4 | grep system_id | cut -d '"' -f 4` + if [ ! -z "$nodes" ]; then + maas maas interface link-subnet $nodes $1 mode=$2 subnet=$3 + fi + done + fi +} + #Below function will create vlan and update interface with the new vlan # will return the vlan id created crvlanupdsubnet() { @@ -152,12 +166,20 @@ case "$1" in crvlanupdsubnet vlan724 2 "PublicNetwork" 724 3 || true crnodevlanint $vlan721 || true crnodevlanint $vlan724 || true - enableautomode eth2.721 AUTO "10.4.9.0/24" || true + enableautomodebyname eth1.721 AUTO "10.4.9.0/24" compute || true + enableautomodebyname eth1.721 AUTO "10.4.9.0/24" control || true ;; 'intelpod6' ) - enableautomode eth1 AUTO "10.4.9.0/24" || true + maas refresh + enableautomodebyname eth1 AUTO "10.4.9.0/24" compute || true + enableautomodebyname eth1 AUTO "10.4.9.0/24" control || true ;; 'orangepod2' ) + maas refresh + enableautomodebyname eth4 AUTO "192.168.22.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 eth3 AUTO "192.168.12.0/24" control || true ;; 'attvirpod1' ) ;; diff --git a/ci/nosdn/01-deploybundle.sh b/ci/nosdn/01-deploybundle.sh index 92295fe7..2ef5c10c 100755 --- a/ci/nosdn/01-deploybundle.sh +++ b/ci/nosdn/01-deploybundle.sh @@ -21,10 +21,6 @@ esac case "$3" in 'orangepod2' ) - cp maas/orange/pod2/control-interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/orange/pod2/compute-interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -33,9 +29,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - # As environment does not need special treatment for interfaces for MAAS 1.9 - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.21 - 10.4.1.29 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -44,9 +37,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) - # As environment does not need special treatment for interfaces for MAAS 1.9 - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.21 - 10.4.1.29 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -55,17 +45,12 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml ;; 'attvirpod1' ) - # As virtual environment does not need special treatment for interfaces. - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml # Choose the external port to go out from gateway to use. sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'default' ) - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index 917cfc3c..74682e76 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute "ntp": @@ -55,13 +55,11 @@ openstack-phase2: - "nodes-api=2" ceph-radosgw: charm: cs:trusty/ceph-radosgw - num_units: 3 + num_units: 1 options: use-embedded-webserver: true to: - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" cinder: charm: cs:trusty/cinder num_units: 3 @@ -92,6 +90,7 @@ openstack-phase2: options: admin-password: openstack admin-token: admin + admin-role: admin ha-mcastport: 5403 vip: 10.4.1.13 to: diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml index b78128c5..eae10815 100644 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-tip.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -98,6 +98,7 @@ openstack-phase2: openstack-origin-git: include-file://keystone-master.yaml "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index 4f305695..137321b0 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -80,6 +80,7 @@ openstack-phase2: options: admin-password: openstack admin-token: admin + admin-role: admin ha-mcastport: 5403 to: - "lxc:nodes-api=0" diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh index 7887a182..27b82ec5 100755 --- a/ci/odl/01-deploybundle.sh +++ b/ci/odl/01-deploybundle.sh @@ -21,10 +21,6 @@ esac case "$3" in 'orangepod2' ) - cp maas/orange/pod2/control-interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/orange/pod2/compute-interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -33,9 +29,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - # As environment does not need special treatment for interfaces for MAAS 1.9 - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -44,9 +37,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) - # As environment does not need special treatment for interfaces for MAAS 1.9 - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -55,17 +45,12 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml ;; 'attvirpod1' ) - # As virtual environment does not need special treatment for interfaces. - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml # Choose the external port to go out from gateway to use. sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'default' ) - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 6a046e38..4b7b20af 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute "ntp": @@ -100,14 +100,12 @@ openstack-phase2: - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 3 + num_units: 1 options: osd-devices: /srv osd-reformat: 'yes' to: - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" ceph-radosgw: charm: cs:trusty/ceph-radosgw num_units: 3 @@ -144,6 +142,7 @@ openstack-phase2: # ha-mcastport: 5402 "admin-password": openstack "admin-token": admin + "admin-role": admin vip: 10.4.1.13 to: - "lxc:nodes-api=0" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 2d9a24ed..ac24385b 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -98,6 +98,7 @@ openstack-phase2: openstack-origin-git: include-file://keystone-master.yaml "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 0e6d4192..b120f416 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -96,6 +96,7 @@ openstack-phase2: # ha-mcastport: 5402 "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/onos/01-deploybundle.sh b/ci/onos/01-deploybundle.sh index dbd74b45..85a5ff98 100644 --- a/ci/onos/01-deploybundle.sh +++ b/ci/onos/01-deploybundle.sh @@ -21,10 +21,6 @@ esac case "$3" in 'orangepod2' ) - cp maas/orange/pod2/control-interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/orange/pod2/compute-interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -33,10 +29,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/intel/pod6/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -45,10 +37,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml ;; 'intelpod5' ) - cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -57,21 +45,12 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml ;; 'attvirpod1' ) - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces - # As virtual environment does not need special treatment for interfaces. - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml # Choose the external port to go out from gateway to use. sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'default' ) - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml # sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml index 608c693b..a1b26887 100644 --- a/ci/onos/juju-deployer/onos-ha.yaml +++ b/ci/onos/juju-deployer/onos-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute "ntp": @@ -100,14 +100,12 @@ openstack-phase2: - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 3 + num_units: 1 options: osd-devices: /srv osd-reformat: 'yes' to: - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" ceph-radosgw: charm: cs:trusty/ceph-radosgw num_units: 3 @@ -145,6 +143,7 @@ openstack-phase2: # ha-mcastport: 5402 "admin-password": openstack "admin-token": admin + "admin-role": admin vip: 10.4.1.13 to: - "lxc:nodes-api=0" diff --git a/ci/onos/juju-deployer/onos-tip.yaml b/ci/onos/juju-deployer/onos-tip.yaml index cfef5a8f..049ca08e 100644 --- a/ci/onos/juju-deployer/onos-tip.yaml +++ b/ci/onos/juju-deployer/onos-tip.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -98,6 +98,7 @@ openstack-phase2: openstack-origin-git: include-file://keystone-master.yaml "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/onos/juju-deployer/onos.yaml b/ci/onos/juju-deployer/onos.yaml index 7bfbc9be..44638d2f 100644 --- a/ci/onos/juju-deployer/onos.yaml +++ b/ci/onos/juju-deployer/onos.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -96,6 +96,7 @@ openstack-phase2: # ha-mcastport: 5402 "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh index ea8290a1..4c1f5d5c 100755 --- a/ci/opencontrail/01-deploybundle.sh +++ b/ci/opencontrail/01-deploybundle.sh @@ -21,10 +21,6 @@ esac case "$3" in 'orangepod2' ) - cp maas/orange/pod2/control-interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces - cp maas/orange/pod2/compute-interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host - cp maas/orange/pod2/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.2.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -33,9 +29,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) - # As environment does not need special treatment for interfaces for MAAS 1.9 - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -44,9 +37,6 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) - # As environment does not need special treatment for interfaces for MAAS 1.9 - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml # choose the correct interface to use for data network @@ -55,17 +45,12 @@ case "$3" in sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml ;; 'attvirpod1' ) - # As virtual environment does not need special treatment for interfaces. - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml # Choose the external port to go out from gateway to use. sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; 'default' ) - sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml - sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml ;; diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 907fe928..c837eebf 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute "ntp": @@ -117,14 +117,12 @@ openstack-phase2: - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 3 + num_units: 1 options: osd-devices: /srv osd-reformat: 'yes' to: - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" ceph-radosgw: charm: cs:trusty/ceph-radosgw num_units: 3 @@ -161,6 +159,7 @@ openstack-phase2: options: "admin-password": openstack "admin-token": admin + "admin-role": admin vip: 10.4.1.13 to: - "lxc:nodes-api=0" diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index da32c8fa..59379d0e 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -107,6 +107,7 @@ openstack-phase2: openstack-origin-git: include-file://keystone-master.yaml "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index ec58c058..fa9647bc 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": @@ -106,6 +106,7 @@ openstack-phase2: options: "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": |