diff options
Diffstat (limited to 'ci/opencontrail')
-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 |
4 files changed, 10 insertions, 24 deletions
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": |