summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy.sh4
-rw-r--r--deploy/README43
-rwxr-xr-xdeploy/deploy.py7
-rw-r--r--deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml2
-rw-r--r--deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml2
-rw-r--r--deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml2
-rw-r--r--deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml2
-rw-r--r--deploy/templates/hardware_environment/vms/fuel.xml4
-rw-r--r--deploy/templates/intel/virtual_environment/noha/vms/compute.xml2
-rw-r--r--deploy/templates/intel/virtual_environment/noha/vms/controller.xml2
-rw-r--r--deploy/templates/intel/virtual_environment/noha/vms/fuel.xml2
-rw-r--r--deploy/templates/virtual_environment/vms/compute.xml2
-rw-r--r--deploy/templates/virtual_environment/vms/controller.xml2
-rw-r--r--deploy/templates/virtual_environment/vms/fuel.xml2
-rw-r--r--deploy/templates/virtual_environment_noha/vms/compute.xml2
-rw-r--r--deploy/templates/virtual_environment_noha/vms/controller.xml2
-rw-r--r--deploy/templates/virtual_environment_noha/vms/fuel.xml2
-rwxr-xr-xprototypes/sfc_tacker/poc.tacker-up.sh13
18 files changed, 61 insertions, 36 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index d83bba2f4..dc13f1c77 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -40,6 +40,7 @@ OPTIONS:
-f Deploy on existing Fuel master
-e Do not launch environment deployment
-F Do only create a Fuel master
+ -h Print this message and exit
-H No health check
-l Lab-name
-p Pod-name
@@ -62,6 +63,7 @@ Input parameters to the build script is:
-f Deploy on existing Fuel master
-e Do not launch environment deployment
-F Do only create a Fuel master
+-h Print this message and exit
-H Do not run fuel built in health-check after successfull deployment
-l Lab name as defined in the configuration directory, e.g. lf
-p POD name as defined in the configuration directory, e.g. pod-1
@@ -116,7 +118,7 @@ DRY_RUN=0
############################################################################
# BEGIN of main
#
-while getopts "b:B:dfFHl:p:s:S:i:h:e" OPTION
+while getopts "b:B:dfFHl:p:s:S:i:he" OPTION
do
case $OPTION in
b)
diff --git a/deploy/README b/deploy/README
index 697a9b393..fd1548344 100644
--- a/deploy/README
+++ b/deploy/README
@@ -56,25 +56,34 @@ you will have to modify them according to your needs
--- Step.2 Run Autodeployment ---
-usage: python deploy.py [-h] [-nf] [-nh] [-fo] [-co] [-c] [-iso [ISO_FILE]]
- [-dea [DEA_FILE]] [-dha [DHA_FILE]] [-s STORAGE_DIR]
- [-b PXE_BRIDGE] [-p FUEL_PLUGINS_DIR]
+usage: python ./deploy.py [-h] [-nf] [-nh] [-fo] [-co] [-c] [-iso [ISO_FILE]]
+ [-dea [DEA_FILE]] [-dha [DHA_FILE]] [-s STORAGE_DIR]
+ [-b PXE_BRIDGE] [-p FUEL_PLUGINS_DIR]
+ [-pc FUEL_PLUGINS_CONF_DIR] [-np]
+ [-dt DEPLOY_TIMEOUT] [-nde]
optional arguments:
- -h, --help show this help message and exit
- -nf Do not install Fuel Master (and Node VMs when using libvirt)
- -nh Don't run health check after deployment
- -fo Install Fuel Master only (and Node VMs when using libvirt)
- -co Cleanup VMs and Virtual Networks according to what is
- defined in DHA
- -c Cleanup after deploy
- -iso [ISO_FILE] ISO File [default: OPNFV.iso]
- -dea [DEA_FILE] Deployment Environment Adapter: dea.yaml
- -dha [DHA_FILE] Deployment Hardware Adapter: dha.yaml
- -s STORAGE_DIR Storage Directory [default: images]
- -b PXE_BRIDGE Linux Bridge for booting up the Fuel Master VM
- [default: pxebr]
- -p FUEL_PLUGINS_DIR Fuel Plugins directory
+ -h, --help show this help message and exit
+ -nf Do not install Fuel Master (and Node VMs when using
+ libvirt)
+ -nh Don't run health check after deployment
+ -fo Install Fuel Master only (and Node VMs when using
+ libvirt)
+ -co Cleanup VMs and Virtual Networks according to what is
+ defined in DHA
+ -c Cleanup after deploy
+ -iso [ISO_FILE] ISO File [default: OPNFV.iso]
+ -dea [DEA_FILE] Deployment Environment Adapter: dea.yaml
+ -dha [DHA_FILE] Deployment Hardware Adapter: dha.yaml
+ -s STORAGE_DIR Storage Directory [default: images]
+ -b PXE_BRIDGE Linux Bridge for booting up the Fuel Master VM
+ [default: pxebr]
+ -p FUEL_PLUGINS_DIR Fuel Plugins directory
+ -pc FUEL_PLUGINS_CONF_DIR
+ Fuel Plugins Configuration directory
+ -np Do not install Fuel Plugins
+ -dt DEPLOY_TIMEOUT Deployment timeout (in minutes) [default: 240]
+ -nde Do not launch environment deployment
* EXAMPLES:
diff --git a/deploy/deploy.py b/deploy/deploy.py
index f86f2be12..0d406412c 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -335,9 +335,10 @@ def parse_arguments():
check_file_exists(args.dea_file)
check_fuel_plugins_dir(args.fuel_plugins_dir)
+ iso_abs_path = os.path.abspath(args.iso_file)
if not args.no_fuel and not args.cleanup_only:
- log('Using OPNFV ISO file: %s' % args.iso_file)
- check_file_exists(args.iso_file)
+ log('Using OPNFV ISO file: %s' % iso_abs_path)
+ check_file_exists(iso_abs_path)
log('Using image directory: %s' % args.storage_dir)
create_dir_if_not_exists(args.storage_dir)
check_bridge(args.pxe_bridge, args.dha_file)
@@ -346,7 +347,7 @@ def parse_arguments():
'no_health_check': args.no_health_check,
'cleanup_only': args.cleanup_only, 'cleanup': args.cleanup,
'storage_dir': args.storage_dir, 'pxe_bridge': args.pxe_bridge,
- 'iso_file': args.iso_file, 'dea_file': args.dea_file,
+ 'iso_file': iso_abs_path, 'dea_file': args.dea_file,
'dha_file': args.dha_file,
'fuel_plugins_dir': args.fuel_plugins_dir,
'fuel_plugins_conf_dir': args.fuel_plugins_conf_dir,
diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml
index 6fb37432a..81203c0a4 100644
--- a/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml
+++ b/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml
@@ -79,7 +79,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml
index cf62fbce2..86c6d11e5 100644
--- a/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml
+++ b/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml
@@ -79,7 +79,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml
index 31e84798b..3e0bb7bff 100644
--- a/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml
+++ b/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml
@@ -77,7 +77,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='sv'>
+ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
<listen type='address' address='127.0.0.1'/>
</graphics>
<sound model='ich6'>
diff --git a/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml b/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml
index b55b16e5f..fe547b811 100644
--- a/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml
+++ b/deploy/templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml
@@ -73,7 +73,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='sv'>
+ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
<listen type='address' address='127.0.0.1'/>
</graphics>
<sound model='ich6'>
diff --git a/deploy/templates/hardware_environment/vms/fuel.xml b/deploy/templates/hardware_environment/vms/fuel.xml
index 72c15b577..8d8dd4494 100644
--- a/deploy/templates/hardware_environment/vms/fuel.xml
+++ b/deploy/templates/hardware_environment/vms/fuel.xml
@@ -73,7 +73,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='sv'>
+ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
<listen type='address' address='127.0.0.1'/>
</graphics>
<sound model='ich6'>
@@ -88,4 +88,4 @@
<label>system_u:system_r:svirt_t:s0:c52,c932</label>
<imagelabel>system_u:object_r:svirt_image_t:s0:c52,c932</imagelabel>
</seclabel>
-</domain> \ No newline at end of file
+</domain>
diff --git a/deploy/templates/intel/virtual_environment/noha/vms/compute.xml b/deploy/templates/intel/virtual_environment/noha/vms/compute.xml
index 6fb37432a..81203c0a4 100644
--- a/deploy/templates/intel/virtual_environment/noha/vms/compute.xml
+++ b/deploy/templates/intel/virtual_environment/noha/vms/compute.xml
@@ -79,7 +79,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/intel/virtual_environment/noha/vms/controller.xml b/deploy/templates/intel/virtual_environment/noha/vms/controller.xml
index cf62fbce2..86c6d11e5 100644
--- a/deploy/templates/intel/virtual_environment/noha/vms/controller.xml
+++ b/deploy/templates/intel/virtual_environment/noha/vms/controller.xml
@@ -79,7 +79,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml b/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml
index 67cccbb1e..b4fa26878 100644
--- a/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml
+++ b/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml
@@ -77,7 +77,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='sv'>
+ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
<listen type='address' address='127.0.0.1'/>
</graphics>
<sound model='ich6'>
diff --git a/deploy/templates/virtual_environment/vms/compute.xml b/deploy/templates/virtual_environment/vms/compute.xml
index f794b651a..1c20b7dcd 100644
--- a/deploy/templates/virtual_environment/vms/compute.xml
+++ b/deploy/templates/virtual_environment/vms/compute.xml
@@ -52,7 +52,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/virtual_environment/vms/controller.xml b/deploy/templates/virtual_environment/vms/controller.xml
index 44dd5b655..febaf3aef 100644
--- a/deploy/templates/virtual_environment/vms/controller.xml
+++ b/deploy/templates/virtual_environment/vms/controller.xml
@@ -52,7 +52,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/virtual_environment/vms/fuel.xml b/deploy/templates/virtual_environment/vms/fuel.xml
index bf8f3e288..6b06a58da 100644
--- a/deploy/templates/virtual_environment/vms/fuel.xml
+++ b/deploy/templates/virtual_environment/vms/fuel.xml
@@ -50,7 +50,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='sv'>
+ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
<listen type='address' address='127.0.0.1'/>
</graphics>
<sound model='ich6'>
diff --git a/deploy/templates/virtual_environment_noha/vms/compute.xml b/deploy/templates/virtual_environment_noha/vms/compute.xml
index f794b651a..1c20b7dcd 100644
--- a/deploy/templates/virtual_environment_noha/vms/compute.xml
+++ b/deploy/templates/virtual_environment_noha/vms/compute.xml
@@ -52,7 +52,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/virtual_environment_noha/vms/controller.xml b/deploy/templates/virtual_environment_noha/vms/controller.xml
index 44dd5b655..febaf3aef 100644
--- a/deploy/templates/virtual_environment_noha/vms/controller.xml
+++ b/deploy/templates/virtual_environment_noha/vms/controller.xml
@@ -52,7 +52,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' keymap='sv'/>
+ <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/>
<sound model='ich6'>
</sound>
<video>
diff --git a/deploy/templates/virtual_environment_noha/vms/fuel.xml b/deploy/templates/virtual_environment_noha/vms/fuel.xml
index 3e7576945..92346040f 100644
--- a/deploy/templates/virtual_environment_noha/vms/fuel.xml
+++ b/deploy/templates/virtual_environment_noha/vms/fuel.xml
@@ -50,7 +50,7 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
- <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='sv'>
+ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
<listen type='address' address='127.0.0.1'/>
</graphics>
<sound model='ich6'>
diff --git a/prototypes/sfc_tacker/poc.tacker-up.sh b/prototypes/sfc_tacker/poc.tacker-up.sh
index be647b409..4dbb37240 100755
--- a/prototypes/sfc_tacker/poc.tacker-up.sh
+++ b/prototypes/sfc_tacker/poc.tacker-up.sh
@@ -350,6 +350,18 @@ function populate_rc() {
done
}
+
+#Configure ODL so that it allows the coexistence between Netvirt and SFC
+function coexistence() {
+ curl -i -u admin:admin -H 'Content-type: application/json' -X PUT \
+ -d '{"netvirt-providers-config":{"table-offset":"1"}}' \
+ http://${mgmt_addr}:${odl_port}/restconf/config/netvirt-providers-config:netvirt-providers-config
+
+ curl -i -u admin:admin -H 'Content-type: application/json' -X PUT \
+ -d '{"sfc-of-renderer-config":{"sfc-of-table-offset":"150","sfc-of-app-egress-table-offset":"11"}}' \
+ http://${mgmt_addr}:${odl_port}/restconf/config/sfc-of-renderer:sfc-of-renderer-config
+}
+
envSetup
deployTackerClient
deployJsonrpclib
@@ -359,6 +371,7 @@ deployTackerServer
populate_client
orchestarte
populate_rc
+coexistence
remove_repo "$MYREPO"
remove_repo "$DEPREPO"