diff options
| -rwxr-xr-x | ci/00-bootstrap.sh | 2 | ||||
| -rwxr-xr-x | ci/clean.sh | 1 | ||||
| -rwxr-xr-x | ci/deploy.sh | 4 | ||||
| -rwxr-xr-x | ci/opencontrail/fetch-charms.sh | 19 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml | 4 | ||||
| -rwxr-xr-x | ci/openstack.sh | 10 |
6 files changed, 21 insertions, 19 deletions
diff --git a/ci/00-bootstrap.sh b/ci/00-bootstrap.sh index 375faa77..59a22197 100755 --- a/ci/00-bootstrap.sh +++ b/ci/00-bootstrap.sh @@ -7,7 +7,7 @@ set -ex juju bootstrap --debug --to bootstrap.maas sleep 5 #disable juju gui until xenial charms are in charm store. -#juju deploy juju-gui --to 0 +juju deploy cs:juju-gui-130 --to 0 JUJU_REPOSITORY= juju set-constraints tags= diff --git a/ci/clean.sh b/ci/clean.sh index adf225c4..105ef0cb 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -11,6 +11,7 @@ if [ -d $HOME/.juju/environments ]; then echo " environment is bootstrapped ..." juju destroy-environment demo-maas -y fi + rm -rf precise rm -rf trusty rm -rf xenial rm -rf $HOME/.juju/j* diff --git a/ci/deploy.sh b/ci/deploy.sh index b91e761c..c4510ab1 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -133,10 +133,10 @@ check_status() { timeoutiter=0 while [ $retval -eq 0 ]; do sleep 30 - juju status > status.txt + juju status > status.txt if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then echo " still executing the reltionship within charms ..." - if [ $timeoutiter -ge 60 ]; then + if [ $timeoutiter -ge 90 ]; then retval=1 fi timeoutiter=$((timeoutiter+1)) diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index 3dd8fa0f..d25881b7 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -26,7 +26,7 @@ git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph git clone https://github.com/openstack/charm-glance.git $distro/glance git clone https://github.com/openstack/charm-keystone.git $distro/keystone git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +#git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller @@ -38,12 +38,13 @@ git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build # Controller specific charm -bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived -bzr branch lp:~stub/charms/$distro/cassandra/noauthentication $distro/cassandra-noauthentication -bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics -bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration -bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control -bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui +bzr branch lp:~sdn-charmers/charms/trusty/keepalived/trunk $distro/keepalived +bzr branch lp:~stub/charms/trusty/cassandra/noauthentication $distro/cassandra +bzr branch lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk $distro/contrail-analytics +bzr branch lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk $distro/contrail-configuration +bzr branch lp:~sdn-charmers/charms/trusty/contrail-control/trunk $distro/contrail-control +bzr branch lp:~sdn-charmers/charms/trusty/contrail-webui/trunk $distro/contrail-webui bzr branch lp:~charmers/charms/precise/zookeeper/trunk precise/zookeeper -bzr branch lp:~opnfv-team/charms/$distro/neutron-api-contrail/trunk $distro/neutron-api-contrail -bzr branch lp:~opnfv-team/charms/$distro/neutron-contrail/trunk $distro/neutron-contrail +bzr branch lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk $distro/neutron-api-contrail +bzr branch lp:~opnfv-team/charms/trusty/neutron-contrail/trunk $distro/neutron-contrail +bzr branch lp:~opnfv-team/charms/trusty/neutron-api/next $distro/neutron-api diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 6e84b6cf..1849f27b 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -260,7 +260,6 @@ openstack-phase2: options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: "" monitor-count: 3 # osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 @@ -382,6 +381,7 @@ openstack-phase2: congress: charm: local:trusty/congress options: - #source-charm: stable/mitaka + #source-branch: stable/mitaka to: - "lxc:nodes=0" + diff --git a/ci/openstack.sh b/ci/openstack.sh index 1e82ff9b..2750bc51 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -76,10 +76,10 @@ create_openrc . ./cloud/admin-openrc wget -P /tmp/images http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img -glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare --progress +openstack image create --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare "cirros-0.3.3-x86_64" #wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img -#glance image-create --name "ubuntu-trusty-daily" --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --progress +#openstack image create --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare "ubuntu-trusty-daily" rm -rf /tmp/images # adjust tiny image @@ -88,10 +88,10 @@ rm -rf /tmp/images # import key pair -keystone tenant-create --name demo --description "Demo Tenant" -keystone user-create --name demo --tenant demo --pass demo --email demo@demo.demo +openstack project create --description "Demo Tenant" demo +openstack user create --project demo --password demo --email demo@demo.demo demo -nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair +openstack keypair create --public-key ~/.ssh/id_rsa.pub ubuntu-keypair # configure external network |