Skip to content

Commit efdc046

Browse files
committed
switch to fos56 as a name and no question from deploy during install
1 parent 0c87e85 commit efdc046

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

cloudify/fortios-mini-poc/inputs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
fos_image: 'fos54'
1+
fos_image: 'fos56'
22
fos_flavor: 'm1.small'
33
ub_image: 'Trusty x86_64'
44
ub_flavor: 'm1.small'

fortios/heat-minipoc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
fosimage:
1010
type: string
1111
description: Fortios image
12-
default: "fos54"
12+
default: "fos56"
1313
ubimage:
1414
type: string
1515
description: Ubuntu image

fortios/minipoc-deploy.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if [ -x $OS_AUTH_URL ]; then
2525
. ~/nova.rc
2626
fi
2727
#Push image
28-
openstack image show "fos54" > /dev/null 2>&1 || openstack image create --disk-format qcow2 --container-format bare --public "fos54" --file fortios.qcow2
28+
openstack image show "fos56" > /dev/null 2>&1 || openstack image create --disk-format qcow2 --container-format bare --public "fos56" --file fortios.qcow2
2929

3030

3131
#Create mgmt network for neutron for tenant VMs
@@ -61,17 +61,17 @@ else
6161
fi
6262

6363

64-
if (nova show fos54 > /dev/null 2>&1 );then
65-
echo "fos54 already installed"
64+
if (nova show fos56 > /dev/null 2>&1 );then
65+
echo "fos56 already installed"
6666
else
6767
neutron port-show left1 > /dev/null 2>&1 ||neutron port-create left --port-security-enabled=False --fixed-ip ip_address=10.40.40.254 --name left1
6868
neutron port-show right1 > /dev/null 2>&1 ||neutron port-create right --port-security-enabled=False --fixed-ip ip_address=10.20.20.254 --name right1
6969
LEFTPORT=`neutron port-show left1 -F id -f value`
7070
RIGHTPORT=`neutron port-show right1 -F id -f value`
71-
nova boot --image "fos54" fos54 --config-drive=true --key-name default --security-group default --flavor m1.small --user-data fos-user-data.txt --nic net-name=mgmt --nic port-id=$LEFTPORT --nic port-id=$RIGHTPORT
71+
nova boot --image "fos56" fos56 --config-drive=true --key-name default --security-group default --flavor m1.small --user-data fos-user-data.txt --nic net-name=mgmt --nic port-id=$LEFTPORT --nic port-id=$RIGHTPORT
7272
FLOAT_IP="$(nova floating-ip-create | grep ext_net | awk -F "|" '{ print $3}')"
73-
while [ $(nova list |grep fos54 | awk -F "|" '{print $4}') == "BUILD" ]; do
73+
while [ $(nova list |grep fos56 | awk -F "|" '{print $4}') == "BUILD" ]; do
7474
sleep 4
7575
done
76-
nova floating-ip-associate fos54 $FLOAT_IP
76+
nova floating-ip-associate fos56 $FLOAT_IP
7777
fi

ubuntu-openstacks/deploy-openstack

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ juju add-model mitaka
99
juju deploy openstack-nonest.yaml
1010
# juju-wait last version was not test with python2 !!
1111
# Move to python3
12-
sudo apt install python3-pip
12+
sudo apt -y install python3-pip
1313
sudo -H pip3 install juju-wait
1414
echo "waiting for deployment to complete can be 1hour"
1515
python3 /usr/local/bin/juju-wait -v

0 commit comments

Comments
 (0)