Move to Icehouse

Now that a stable/havana branch of puppet_openstack_builder has been
cut, we need to move the default settings to Icehouse in the master
branch.  This commit does that.

Change-Id: I026e0cb1b932c71db433f65df76a0fae5a824fee

Puppetfile

@@ -3,7 +3,7 @@
 # this file also accepts a few environment variables
 #
 git_protocol=ENV['git_protocol'] || 'git'
-openstack_version=ENV['openstack_version'] || 'havana'
+openstack_version=ENV['openstack_version'] || 'icehouse'
 
 #
 # this modulefile has been configured to use two sets of repos.
@@ -17,8 +17,8 @@ openstack_version=ENV['openstack_version'] || 'havana'
 # work yet
 #
 
-unless ['grizzly', 'havana'].include?(openstack_version)
+unless ['grizzly', 'havana', 'icehouse'].include?(openstack_version)
-  abort("Only grizzly and havana are currently supported")
+  abort("Only grizzly, havana, and icehouse are currently supported")
 end
 
 if openstack_version == 'grizzly'
@@ -41,9 +41,11 @@ else
   if openstack_version == 'grizzly'
     openstack_module_branch   = 'stable/grizzly'
   elsif openstack_version == 'havana'
-    openstack_module_branch   = 'master'
+    openstack_module_branch   = 'stable/havana'
+  elsif openstack_version == 'icehouse'
+    openstack_module_branch   = 'stable/icehouse'
   else
-    abort('only grizzly and havana are supported atm')
+    abort('only grizzly, havana, and icehouse are supported')
   end
   # use the upstream modules where they exist
   branch_name               = 'master'

contrib/ci/ci_config.yaml

@@ -8,7 +8,7 @@ scenario: 2_role
 initial_ntp: 192.168.26.186
 installer_repo: stackforge
 installer_branch: master
-openstack_version: havana
+openstack_version: icehouse
 git_protocol: git
 apt_mirror_ip: 192.168.26.170
 apt_proxy_host: 192.168.26.170

data/config.yaml

@@ -28,7 +28,7 @@ scenario: 2_role
 
 # [*openstack_version*]
 # The release of openstack to install. Note that grizzly will require switching back to Quantum
-# Options: havana, grizzly
+# Options: icehouse, havana, grizzly
 
 # [*git_protocol*]
 # (optional) Git protocol to use when cloning modules on testing VMs

data/hiera_data/common.yaml

@@ -114,7 +114,7 @@ nova::compute::force_config_drive: true
 coe::base::package_repo: cloud_archive
 
 # The base version of OpenStack to be installed (e.g. 'havana').
-openstack_release: havana
+openstack_release: icehouse
 
 # The name of the pocket to use for both
 # the supplemental and main repos.  This setting may not be useful for

install-scripts/cisco.install.sh

@@ -13,10 +13,10 @@ export FACTER_vendorpuppet=vendor
 export install_type=deb
 
 # Add Cisco repo
-cat > /etc/apt/sources.list.d/cisco-openstack-mirror_havana.list<<EOF
+cat > /etc/apt/sources.list.d/cisco-openstack-mirror_icehouse.list<<EOF
-# cisco-openstack-mirror_havana
+# cisco-openstack-mirror_icehouse
-deb http://openstack-repo.cisco.com/openstack/cisco havana-proposed main
+deb http://openstack-repo.cisco.com/openstack/cisco icehouse-proposed main
-deb-src http://openstack-repo.cisco.com/openstack/cisco havana-proposed main
+deb-src http://openstack-repo.cisco.com/openstack/cisco icehouse-proposed main
 EOF
 
 echo "-----BEGIN PGP PUBLIC KEY BLOCK-----

tests/basic_test.sh

@@ -82,9 +82,9 @@ if [ -n "${openstack_package_repo:-}" ]; then
   fi
 fi
 
-if [ $openstack_version = 'havana' ];then
+if [ $openstack_version != 'grizzly' ];then
   echo 'network_service: neutron' >> data/global_hiera_params/jenkins.yaml
-elif [ $openstack_version = 'grizzly' ]; then
+else
   echo 'network_service: quantum' >> data/global_hiera_params/jenkins.yaml
 fi