~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to manual-deploy

  • Committer: Aaron Bentley
  • Date: 2014-02-21 15:05:06 UTC
  • mto: (250.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 252.
  • Revision ID: aaron.bentley@canonical.com-20140221150506-0qhkzayqkv30atqm
Work around arbitrary-storage-port by using hostname, not ip. More port waits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
machine_0_id=$($SCRIPTS/ec2-run-instance-get-id)
8
8
machine_1_id=$($SCRIPTS/ec2-run-instance-get-id)
9
9
machine_2_id=$($SCRIPTS/ec2-run-instance-get-id)
10
 
machine_0_ip=$($SCRIPTS/ec2-get-ip $machine_0_id)
11
 
machine_1_ip=$($SCRIPTS/ec2-get-ip $machine_1_id)
12
 
machine_2_ip=$($SCRIPTS/ec2-get-ip $machine_2_id)
 
10
machine_0_name=$($SCRIPTS/ec2-get-name $machine_0_id)
 
11
machine_1_name=$($SCRIPTS/ec2-get-name $machine_1_id)
 
12
machine_2_name=$($SCRIPTS/ec2-get-name $machine_2_id)
13
13
export JUJU_HOME=$(pwd)/manual-provider-home
14
14
rm -f $JUJU_HOME/environments/manual.jenv
15
 
sed -i "s/bootstrap-host: .*/bootstrap-host: $machine_0_ip/" $JUJU_HOME/environments.yaml
16
 
$SCRIPTS/wait-for-ssh $machine_0_ip
 
15
sed -i "s/bootstrap-host: .*/bootstrap-host: $machine_0_name/" $JUJU_HOME/environments.yaml
 
16
$SCRIPTS/wait-for-ssh $machine_0_name
17
17
juju bootstrap --show-log -e manual --upload-tools
18
 
$SCRIPTS/wait-for-ssh $machine_0_ip 8040
19
 
juju add-machine ssh:$machine_1_ip
20
 
juju add-machine ssh:$machine_2_ip
21
 
#echo euca-terminate-instances $machine_0_id $machine_1_id $machine_2_id
 
18
$SCRIPTS/wait-for-ssh $machine_0_name 8040
 
19
$SCRIPTS/wait-for-ssh $machine_1_name
 
20
juju add-machine ssh:$machine_1_name
 
21
$SCRIPTS/wait-for-ssh $machine_2_name
 
22
juju add-machine ssh:$machine_2_name
22
23
 
23
24
if $SCRIPTS/deploy_stack.py --already-bootstrapped manual; then
24
25
  exit_code=0