Switching to Be and updating the nova floating pool default

JIRA: APEX-87, APEX-77

Change-Id: I2aeee20574894dab5b2ce62a281aa9d75ae80644

2 files changed, 57 insertions, 44 deletions

diff --git a/build/instack.sh b/build/instack.sh
index 98b53a38..91c0d355 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -67,15 +67,6 @@ elif [ "$1" == "-master" ]; then
     sudo rm -f /etc/yum.repos.d/delorean-current.repo
 fi
 
-# install the opendaylight yum repo definition
-cat << 'EOF' | sudo tee /etc/yum.repos.d/opendaylight.repo
-[opendaylight]
-name=OpenDaylight $releasever - $basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-33-release/$basearch/os/
-enabled=1
-gpgcheck=0
-EOF
-
 # ensure the undercloud package is installed so we can build the undercloud
 if ! rpm -q instack-undercloud > /dev/null; then
     sudo yum install -y python-tripleoclient
@@ -264,8 +255,7 @@ tar -czf puppet-aodh.tar.gz aodh
 # Add epel, aodh and ceph, remove openstack-neutron-openvswitch
 AODH_PKG="openstack-aodh-api,openstack-aodh-common,openstack-aodh-compat,openstack-aodh-evaluator,openstack-aodh-expirer"
 AODH_PKG+=",openstack-aodh-listener,openstack-aodh-notifier"
-LIBGUESTFS_BACKEND=direct virt-customize --upload "/tmp/xfs-grow-remount-fix.service:/usr/lib/systemd/system/xfs-grow-remount-fix.service" \
-    --run-command "systemctl enable xfs-grow-remount-fix.service" \
+LIBGUESTFS_BACKEND=direct virt-customize \
     --upload puppet-aodh.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && rm -rf aodh && tar xzf puppet-aodh.tar.gz" \
     --run-command "yum remove -y openstack-neutron-openvswitch" \
@@ -281,15 +271,23 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload "/tmp/xfs-grow-remount-fix.ser
 cat > /tmp/opendaylight.repo << EOF
 [opendaylight]
 name=OpenDaylight \$releasever - \$basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-33-release/\$basearch/os/
+baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/\$basearch/os/
 enabled=1
 gpgcheck=0
 EOF
 
+odlrpm=opendaylight-4.0.0-1.rc2.el7.noarch.rpm
+if [ -f ${rdo_images_uri}/$odlrpm ]; then
+    LIBGUESTFS_BACKEND=direct virt-customize --upload ${rdo_images_uri}/$odlrpm:/tmp/
+    opendaylight=/tmp/$odlrpm
+else
+    opendaylight=opendaylight
+fi
+
 # install ODL packages
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
-    --install opendaylight,python-networking-odl \
+    --install ${opendaylight},python-networking-odl \
     -a overcloud-full-opendaylight.qcow2
 
 ## WORK AROUND
@@ -297,10 +295,14 @@ LIBGUESTFS_BACKEND=direct virt-customize \
 
 # upload the opendaylight puppet module
 rm -rf puppet-opendaylight
-git clone -b 2.2.0 https://github.com/dfarrell07/puppet-opendaylight
-pushd puppet-opendaylight
-git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
-popd
+if [ -f ${rdo_images_uri}/puppet-opendaylight-3.2.2.tar.gz ]; then
+    cp ${rdo_images_uri}/puppet-opendaylight-3.2.2.tar.gz puppet-opendaylight.tar.gz
+else
+    git clone -b opnfv_integration https://github.com/dfarrell07/puppet-opendaylight
+    pushd puppet-opendaylight
+    git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
+    popd
+fi
 LIBGUESTFS_BACKEND=direct virt-customize --upload puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
                                          --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
                                          --upload ../opendaylight-puppet-neutron.patch:/tmp \
@@ -338,23 +340,10 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../aodh-tripleoclient.patch:/t
 #####    Adding SFC+OpenDaylight overcloud #####
 ################################################
 
-cat > /tmp/opendaylight.repo << EOF
-[opendaylight]
-name=OpenDaylight \$releasever - \$basearch
-baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/\$basearch/os/
-enabled=1
-gpgcheck=0
-EOF
 
 #copy opendaylight overcloud full to isolate odl-sfc
 cp overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc.qcow2
 
-# upload the opendaylight puppet module
-rm -rf puppet-opendaylight
-git clone -b opnfv_integration https://github.com/dfarrell07/puppet-opendaylight
-pushd puppet-opendaylight
-git archive --format=tar.gz --prefix=opendaylight/ HEAD > ../puppet-opendaylight.tar.gz
-popd
 
 # kernel is patched with patch from this post
 # http://xfs.org/index.php/XFS_FAQ#Q:_Why_do_I_receive_No_space_left_on_device_after_xfs_growfs.3F
@@ -365,13 +354,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command 'yum downgrade -y https://radez.fedorapeople.org/openvswitch-2.3.90-1.x86_64.rpm' \
     --run-command 'rm -f /lib/modules/3.13.7-1.el7.centos_xfs_grow.x86_64/kernel/net/openvswitch/openvswitch.ko' \
     --run-command 'ln -s /lib/modules/3.13.7-1.el7.centos_xfs_grow.x86_64/kernel/extra/openvswitch/openvswitch.ko /lib/modules/3.13.7-1.el7.centos_xfs_grow.x86_64/kernel/net/openvswitch/openvswitch.ko' \
-    --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
-    --run-command "yum remove -y opendaylight" \
-    --run-command "yum clean all" \
-    --run-command "yum install -y opendaylight" \
-    --run-command "rm -rf /etc/puppet/modules/opendaylight && rm -f /etc/puppet/modules/puppet-opendaylight.tar.gz " \
-    --upload puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
-    --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
     -a overcloud-full-opendaylight-sfc.qcow2
 
 
diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch
index 10ae0a71..7933927a 100644
--- a/build/opnfv-tripleo-heat-templates.patch
+++ b/build/opnfv-tripleo-heat-templates.patch
@@ -1,8 +1,30 @@
-From 966d6b67fa0452bffb01f0d7a4c4935f82f84c5b Mon Sep 17 00:00:00 2001
+From 9593cf0e62cb324a50163f931842a3f32d11cae6 Mon Sep 17 00:00:00 2001
 From: Tim Rozet <tdrozet@gmail.com>
 Date: Tue, 12 Jan 2016 16:49:57 -0500
-Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
+Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support Adds
+ opendaylight L3 support Fixes missing opendaylight install param for ODL L3
+ Deploy Aodh services, replacing Ceilometer Alarm Ceilometer Alarm is
+ deprecated in Liberty by Aodh.
 
+This patch:
+* manage Aodh Keystone resources
+* deploy Aodh API under WSGI, Notifier, Listener and Evaluator
+* manage new parameters to customize Aodh deployment
+* uses ceilometer DB for the upgrade path
+
+WIP - pacemaker work needs to be finished.
+Fixes OpenDaylightEnableL3 to set to 'yes' string
+Adds AODH Pacemaker constraint for keystone
+Fixes cinder keystone auth uri
+aodh fixes
+Adds specific env for SFC, and parameterizes ODL feature boot
+Fixes SFC and SFC coexistence
+Fix aodh database connection
+Set to mongo rather than the default sqlite
+Also move the aodh config to step 4 before pacemaker starts services
+Move ceilometer event pipeline to correct place
+Was missing .yaml
+update the nova floating pool id
 ---
  environments/onos.yaml                             |   8 +
  environments/opendaylight-external.yaml            |  25 ++
@@ -16,13 +38,13 @@ Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
  puppet/compute.yaml                                |  35 ++
  puppet/controller.yaml                             |  93 ++++-
  puppet/hieradata/common.yaml                       |   1 +
- puppet/hieradata/controller.yaml                   |   3 +
+ puppet/hieradata/controller.yaml                   |   5 +-
  puppet/manifests/overcloud_compute.pp              |  31 +-
  puppet/manifests/overcloud_controller.pp           | 128 +++++-
  puppet/manifests/overcloud_controller_pacemaker.pp | 444 ++++++++++++++-------
  puppet/manifests/overcloud_opendaylight.pp         |  27 ++
  puppet/opendaylight-puppet.yaml                    | 223 +++++++++++
- 18 files changed, 1063 insertions(+), 161 deletions(-)
+ 18 files changed, 1064 insertions(+), 162 deletions(-)
  create mode 100644 environments/onos.yaml
  create mode 100644 environments/opendaylight-external.yaml
  create mode 100644 environments/opendaylight.yaml
@@ -794,7 +816,7 @@ index 030f661..5840016 100644
  nova::network::neutron::neutron_admin_tenant_name: 'service'
  nova::network::neutron::neutron_admin_username: 'neutron'
 diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
-index 4b7fd81..4f1fef6 100644
+index 4b7fd81..7dbc2e9 100644
 --- a/puppet/hieradata/controller.yaml
 +++ b/puppet/hieradata/controller.yaml
 @@ -32,6 +32,7 @@ redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
@@ -813,6 +835,15 @@ index 4b7fd81..4f1fef6 100644
  
  # keystone
  keystone::cron::token_flush::maxdelay: 3600
+@@ -72,7 +74,7 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
+ 
+ # nova
+ nova::notify_on_state_change: 'vm_and_task_state'
+-nova::api::default_floating_pool: 'public'
++nova::api::default_floating_pool: 'external'
+ nova::api::osapi_v3: true
+ nova::scheduler::filter::ram_allocation_ratio: '1.0'
+ 
 @@ -115,6 +117,7 @@ tripleo::loadbalancer::mysql: true
  tripleo::loadbalancer::redis: true
  tripleo::loadbalancer::swift_proxy_server: true
@@ -1045,7 +1076,7 @@ index 1f6c2be..1095758 100644
    include ::heat
    include ::heat::api
 diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
-index 3fb92f3..774f323 100644
+index 3fb92f3..732afa2 100644
 --- a/puppet/manifests/overcloud_controller_pacemaker.pp
 +++ b/puppet/manifests/overcloud_controller_pacemaker.pp
 @@ -380,6 +380,21 @@ if hiera('step') >= 2 {
@@ -1898,5 +1929,5 @@ index 0000000..6488e0e
 +      - - {get_attr: [OpenDaylightDeployment, deploy_stdout]}
 +        - {get_param: UpdateIdentifier}
 -- 
-2.5.4 (Apple Git-61)
+2.5.0