summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild/overcloud-full.sh1
-rwxr-xr-xbuild/undercloud.sh4
-rw-r--r--ci/PR_revision.log1
-rwxr-xr-xci/util.sh10
-rw-r--r--docs/installation-instructions/architecture.rst53
-rwxr-xr-xlib/virtual-setup-functions.sh2
6 files changed, 68 insertions, 3 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 6a72705a..a7d04eeb 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -140,6 +140,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
--run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \
+ --run-command "pip install python-senlinclient" \
-a overcloud-full_build.qcow2
mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
diff --git a/build/undercloud.sh b/build/undercloud.sh
index d6c6c414..43884b16 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -62,6 +62,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
--upload /tmp/tacker.repo:/etc/yum.repos.d/ \
--install "python-tackerclient" \
+ --install "python2-aodhclient" \
+ --install "openstack-heat-engine" \
+ --install "openstack-heat-api-cfn" \
+ --install "openstack-heat-api" \
-a undercloud_build.qcow2
# Add custom IPA to allow kernel params
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 5ff84dfc..5339f453 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -22,3 +22,4 @@
52,Add notifier topic to ceilometer
53,Add numa to controller hiera hierarchy
54,fix network mtu
+56,fixes tacker config for heat_uri
diff --git a/ci/util.sh b/ci/util.sh
index 6681ff56..bcb3a3a7 100755
--- a/ci/util.sh
+++ b/ci/util.sh
@@ -91,13 +91,19 @@ parse_cmdline() {
;;
mock-detached)
if [ "$2" == "on" ]; then
- echo "Blocking output http and https traffic"
+ echo "Blocking output http (80) traffic"
iptables -A OUTPUT -p tcp --dport 80 -j REJECT
+ echo "Blocking output https (443) traffic"
iptables -A OUTPUT -p tcp --dport 443 -j REJECT
+ echo "Blocking output dns (53) traffic"
+ iptables -A OUTPUT -p tcp --dport 53 -j REJECT
elif [ "$2" == "off" ]; then
- echo "Allowing output http and https traffic"
+ echo "Allowing output http (80) traffic"
iptables -D OUTPUT -p tcp --dport 80 -j REJECT
+ echo "Allowing output https (443) traffic"
iptables -D OUTPUT -p tcp --dport 443 -j REJECT
+ echo "Allowing output dns (53) traffic"
+ iptables -D OUTPUT -p tcp --dport 53 -j REJECT
else
display_usage
fi
diff --git a/docs/installation-instructions/architecture.rst b/docs/installation-instructions/architecture.rst
index bf2f9db4..c63da27c 100644
--- a/docs/installation-instructions/architecture.rst
+++ b/docs/installation-instructions/architecture.rst
@@ -22,3 +22,56 @@ of the Apex RPM.
The overcloud is OPNFV. Configuration will be passed into undercloud and
the undercloud will use OpenStack's orchestration component, named Heat, to
execute a deployment that will provision the target OPNFV nodes.
+
+OPNFV Scenario Architecture
+===========================
+
+OPNFV distinguishes different types of SDN controllers, deployment options, and
+features into "scenarios". These scenarios are universal across all OPNFV
+installers, although some may or may not be supported by each installer.
+
+The standard naming convention for a scenario is:
+<VIM platform>-<SDN type>-<feature>-<ha/noha>
+
+The only supported VIM type is "OS" (OpenStack), while SDN types can be any
+supported SDN controller. "feature" includes things like ovs_dpdk, sfc, etc.
+"ha" or "noha" determines if the deployment will be highly available. If "ha"
+is used at least 3 control nodes are required.
+
+OPNFV Scenarios in Apex
+=======================
+
+Apex provides pre-built scenario files in /etc/opnfv-apex which a user can
+select from to deploy the desired scenario. Simply pass the desired file to
+the installer as a (-d) deploy setting. Read further in the Apex documentation
+to learn more about invoking the deploy command. Below is quick reference
+matrix for OPNFV scenarios supported in Apex. Please refer to the respective
+OPNFV Docs documentation for each scenario in order to see a full scenario
+description. The following scenarios correspond to a supported <Scenario>.yaml
+deploy settings file:
+
++-------------------------+------------+-----------------+
+| **Scenario** | **Owner** | **Known Issues**|
++-------------------------+------------+-----------------+
+| os-nosdn-nofeature-ha | Apex | |
++-------------------------+------------+-----------------+
+| os-nosdn-nofeature-noha | Apex | |
++-------------------------+------------+-----------------+
+| os-nosdn-ovs-noha | OVS for NFV| |
++-------------------------+------------+-----------------+
+| os-nosdn-fdio-noha | FDS | |
++-------------------------+------------+-----------------+
+| os-odl_l2-nofeature-ha | Apex | |
++-------------------------+------------+-----------------+
+| os-odl_l3-nofeature-ha | Apex | APEX-112 |
++-------------------------+------------+-----------------+
+| os-odl_l2-sfc-noha | SFC | |
++-------------------------+------------+-----------------+
+| os-odl_l2-bgpvpn-noha | SDNVPN | |
++-------------------------+------------+-----------------+
+| os-odl_l2-fdio-noha | FDS | |
++-------------------------+------------+-----------------+
+| os-onos-nofeature-ha | ONOSFW | |
++-------------------------+------------+-----------------+
+| os-onos-sfc-ha | ONOSFW | |
++-------------------------+------------+-----------------+
diff --git a/lib/virtual-setup-functions.sh b/lib/virtual-setup-functions.sh
index ed4d4dfd..abff25e4 100755
--- a/lib/virtual-setup-functions.sh
+++ b/lib/virtual-setup-functions.sh
@@ -45,7 +45,7 @@ EOF
VM_COMPUTES=$((VM_COMPUTES - 1))
else
capability="profile:control"
- if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ha_enabled" == "True" && "$ramsize" -lt 10240 ]]; then
+ if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "$ramsize" -lt 10240 ]]; then
echo "WARN: RAM per controller too low. OpenDaylight specified in HA deployment requires at least 10GB"
echo "INFO: Increasing RAM per controller to 10GB"
ramsize=10240