Merge "brbm bridge creation failed during deployment"

diff --git a/INFO b/INFO
index 46ef5bd..6fd6c75 100644 (file)
--- a/INFO
+++ b/INFO
@@ -22,5 +22,6 @@ Repository: apex
 Committers:
 dradez@redhat.com
 trozet@redhat.com
+michapma@redhat.com
 
 Link to TSC approval of the project: http://ircbot.wl.linuxfoundation.org/meetings/opnfv-meeting/2015/opnfv-meeting.2015-07-14-14.00.html

diff --git a/build/nics-compute.yaml.jinja2 b/build/nics-compute.yaml.jinja2
index 12d9059..3a73bbd 100644 (file)
--- a/build/nics-compute.yaml.jinja2
+++ b/build/nics-compute.yaml.jinja2
@@ -106,20 +106,12 @@ resources:
             {%- set nic_index = 2 %}
             {%- if 'private_network' in enabled_networks %}
             -
-              # Create a bridge which can also be used for VLAN-mode bridge mapping
-              type: ovs_bridge
-              name: br-tenant
+              type: interface
+              name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
               use_dhcp: false
               addresses:
                 -
                   ip_netmask: {get_param: TenantIpSubnet}
-              members:
-                -
-                  type: interface
-                  name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
-                  use_dhcp: false
-                  # force the MAC address of the bridge to this interface
-                  primary: true
             {%- endif %}
             {%- if external_net_type == "interface" %}
             -

diff --git a/build/nics-controller.yaml.jinja2 b/build/nics-controller.yaml.jinja2
index d135e2e..d97ee39 100644 (file)
--- a/build/nics-controller.yaml.jinja2
+++ b/build/nics-controller.yaml.jinja2
@@ -104,20 +104,12 @@ resources:
             {%- set nic_index = 2 %}
             {%- if 'private_network' in enabled_networks %}
             -
-              # Create a bridge which can also be used for VLAN-mode bridge mapping
-              type: ovs_bridge
-              name: br-tenant
+              type: interface
+              name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
               use_dhcp: false
               addresses:
                 -
                   ip_netmask: {get_param: TenantIpSubnet}
-              members:
-                -
-                  type: interface
-                  name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
-                  use_dhcp: false
-                  # force the MAC address of the bridge to this interface
-                  primary: true
             {%- endif %}
             -
               type: ovs_bridge

diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec
index 8048dea..0e44ebb 100644 (file)
--- a/build/opnfv-apex-common.spec
+++ b/build/opnfv-apex-common.spec
@@ -24,6 +24,8 @@ https://wiki.opnfv.org/apex
 rst2html docs/installation-instructions/index.rst docs/installation-instructions.html
 rst2html docs/release-notes/release-notes.rst docs/release-notes.html
 
+%global __python %{__python3}
+
 %install
 mkdir -p %{buildroot}%{_bindir}/
 install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy
@@ -66,13 +68,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %attr(755,root,root) %{_bindir}/opnfv-util
 %{_var}/opt/opnfv/lib/common-functions.sh
 %{_var}/opt/opnfv/lib/utility-functions.sh
-%{_var}/opt/opnfv/lib/python/apex-python-utils.py
-%{_var}/opt/opnfv/lib/python/apex-python-utils.pyo
-%{_var}/opt/opnfv/lib/python/apex-python-utils.pyc
-%{python3_sitelib}/apex/ip_utils.py
-%{python3_sitelib}/apex/net_env.py
-%{python3_sitelib}/apex/__init__.py
-%{python3_sitelib}/apex/__pycache__/*
+%{_var}/opt/opnfv/lib/python/
+%{python3_sitelib}/apex/
 %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh
 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
@@ -90,6 +87,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
+* Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5
+- Fixes python3 dependency.
 * Sun May 8 2016 Feng Pan <fpan@redhat.com> - 3.0-4
 - Adds dependency for python34-setuptools
 * Fri Apr 22 2016 Feng Pan <fpan@redhat.com> - 3.0-3

diff --git a/build/undercloud.sh b/build/undercloud.sh
index 65462ec..ed4f2b3 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -67,6 +67,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yum update -y openwsman*" \
     --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \
     --upload ../opnfv-environment.yaml:/home/stack/ \
+    --upload ../virtual-environment.yaml:/home/stack/ \
     -a undercloud.qcow2
 
 popd > /dev/null

diff --git a/build/variables.sh b/build/variables.sh
index 9bb40a9..115650d 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -9,5 +9,5 @@
 ##############################################################################
 
 rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/
-onos_release_uri=http://downloads.onosproject.org/release
+onos_release_uri=https://dl.dropboxusercontent.com/u/7079970/
 onos_release_file=onos-1.5.0.tar.gz

diff --git a/build/virtual-environment.yaml b/build/virtual-environment.yaml
new file mode 100644 (file)
index 0000000..6f1d051
--- /dev/null
+++ b/build/virtual-environment.yaml
@@ -0,0 +1,17 @@
+parameter_defaults:
+  controllerExtraConfig:
+  # In releases before Mitaka, HeatWorkers doesn't modify
+  # num_engine_workers, so handle via heat::config
+    heat::config::heat_config:
+      DEFAULT/num_engine_workers:
+        value: 1
+    heat::api_cloudwatch::enabled: false
+    heat::api_cfn::enabled: false
+  HeatWorkers: 1
+  CeilometerWorkers: 1
+  CinderWorkers: 1
+  GlanceWorkers: 1
+  KeystoneWorkers: 1
+  NeutronWorkers: 1
+  NovaWorkers: 1
+  SwiftWorkers: 1

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
new file mode 100644 (file)
index 0000000..edd4298
--- /dev/null
+++ b/ci/PR_revision.log
@@ -0,0 +1,5 @@
+#Dummy file used to store history of PRs
+#Note this is only needed for triggering commits with no code change in
+#Apex, but changes do occur in opnfv-tht
+#PR number, PR Title
+14,Adds ODL DLUX GUI to L2/L3 deployments

diff --git a/ci/deploy.sh b/ci/deploy.sh
index b0b70dd..2853f18 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -372,7 +372,7 @@ function setup_undercloud_vm {
       if [[ $enabled_network_list =~ "public_network" ]]; then
         undercloud_nets+=" public_network"
       fi
-      define_vm undercloud hd 30 "$undercloud_nets" 4 10240
+      define_vm undercloud hd 30 "$undercloud_nets" 4 12288
 
       ### this doesn't work for some reason I was getting hangup events so using cp instead
       #virsh vol-upload --pool default --vol undercloud.qcow2 --file $CONFIG/stack/undercloud.qcow2
@@ -739,6 +739,11 @@ sleep 30
 sudo systemctl restart openstack-glance-api
 sudo systemctl restart openstack-nova-conductor
 sudo systemctl restart openstack-nova-compute
+
+sudo sed -i '/num_engine_workers/c\num_engine_workers = 2' /etc/heat/heat.conf
+sudo sed -i '/#workers\s=/c\workers = 2' /etc/heat/heat.conf
+sudo systemctl restart openstack-heat-engine
+sudo systemctl restart openstack-heat-api
 EOI
 # WORKAROUND: must restart the above services to fix sync problem with nova compute manager
 # TODO: revisit and file a bug if necessary. This should eventually be removed
@@ -834,6 +839,8 @@ function undercloud_prep_overcloud_deploy {
 
   if [[ ! "$virtual" == "TRUE" ]]; then
      DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
+  else
+     DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
   fi
 
   DEPLOY_OPTIONS+=" -e opnfv-environment.yaml"

diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
new file mode 100644 (file)
index 0000000..9bda3e8
--- /dev/null
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -0,0 +1,10 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: false
+  sdn_l3: false
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: false

diff --git a/config/deploy/os-opencontrail-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml
similarity index 100%
rename from config/deploy/os-opencontrail-nofeature-ha.yaml
rename to config/deploy/os-ocl-nofeature-ha.yaml