Update CI boxes to latest versions

For some of the boxes a new version has come out, for others there was an upgrade in the minor release. Change-Id: I1ff13eefdaa6676536b9ac38c15beba9849c3751
2015-02-27 00:37:53 +01:00
parent e75520a5e9
commit 16a160a8ff
21 changed files with 143 additions and 85 deletions
--- a/.nodeset.yml
+++ b/.nodeset.yml
@@ -13,13 +13,33 @@ sets:
        options:
                 ip: '10.11.12.3'
                 idedisk: 10
-  'one-ubuntu-server-1404-x64':
+  'ubuntu-server-1404-x64':
    nodes:
      'first':
        prefab: 'ubuntu-server-1404-x64'
        options:
                 ip: '10.11.12.2'
                 idedisk: 10
+  'two-ubuntu-server-1204-x64':
+    default_node: 'first'
+    nodes:
+      'first':
+        prefab: 'ubuntu-server-1204-x64'
+        options:
+                 ip: '10.11.12.2'
+                 idedisk: 10
+      'second':
+        prefab: 'ubuntu-server-1204-x64'
+        options:
+                 ip: '10.11.12.3'
+                 idedisk: 10
+  'ubuntu-server-1204-x64':
+    nodes:
+      'first':
+        prefab: 'ubuntu-server-1204-x64'
+        options:
+                 ip: '10.11.12.2'
+                 idedisk: 10
  'two-ubuntu-server-12042-x64':
    default_node: 'first'
    nodes:
@@ -33,13 +53,6 @@ sets:
        options:
                 ip: '10.11.12.3'
                 disk: 10
-  'one-ubuntu-server-12042-x64':
-    nodes:
-      'first':
-        prefab: 'ubuntu-server-12042-x64'
-        options:
-                 ip: '10.11.12.2'
-                 disk: 10
  'two-centos-70-x64':
    default_node: 'first'
    nodes:
@@ -53,13 +66,33 @@ sets:
        options:
                 ip: '10.11.12.3'
                 idedisk: 10
-  'one-centos-70-x64':
+  'centos-70-x64':
    nodes:
      'first':
        prefab: 'centos-70-x64'
        options:
                 ip: '10.11.12.2'
                 idedisk: 10
+  'two-centos-66-x64':
+    default_node: 'first'
+    nodes:
+      'first':
+        prefab: 'centos-66-x64'
+        options:
+                 ip: '10.11.12.2'
+                 idedisk: 10
+      'second':
+        prefab: 'centos-66-x64'
+        options:
+                 ip: '10.11.12.3'
+                 idedisk: 10
+  'centos-66-x64':
+    nodes:
+      'first':
+        prefab: 'centos-66-x64'
+        options:
+                 ip: '10.11.12.2'
+                 idedisk: 10
  'two-centos-65-x64':
    default_node: 'first'
    nodes:
@@ -73,31 +106,4 @@ sets:
        options:
                 ip: '10.11.12.3'
                 idedisk: 10
-  'one-centos-65-x64':
-    nodes:
-      'first':
-        prefab: 'centos-65-x64'
-        options:
-                 ip: '10.11.12.2'
-                 idedisk: 10
-  'two-centos-64-x64':
-    default_node: 'first'
-    nodes:
-      'first':
-        prefab: 'centos-64-x64'
-        options:
-                 ip: '10.11.12.2'
-                 disk: 10
-      'second':
-        prefab: 'centos-64-x64'
-        options:
-                 ip: '10.11.12.3'
-                 disk: 10
-  'one-centos-64-x64':
-    nodes:
-      'first':
-        prefab: 'centos-64-x64'
-        options:
-                 ip: '10.11.12.2'
-                 disk: 10

--- a/.prefabs.yml
+++ b/.prefabs.yml
@@ -20,12 +20,39 @@
  provider_specifics:
    vagrant_virtualbox:
      box: 'puppetlabs/ubuntu-14.04-64-nocm'
-      box_url: 'https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm/versions/1.0.0/providers/virtualbox.box'
+      box_url: 'https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm'
    vagrant_vmware_fusion:
      box: 'puppetlabs/ubuntu-14.04-64-nocm'
-      box_url: 'https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm/versions/1.0.0/providers/vmware_fusion.box'
+      box_url: 'https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm'
    vsphere:
      template: 'ubuntu-1404-x86_64'
+'ubuntu-server-1204-x64':
+  description: ""
+  facts:
+    architecture: amd64
+    kernel: Linux
+    operatingsystem: Ubuntu
+    lsbdistid: Ubuntu
+    facterversion: "2.4.1"
+    kernelmajversion: "3.11"
+    kernelrelease: "3.11.0-15-generic"
+    kernelversion: "3.11.0"
+    lsbdistcodename: precise
+    lsbdistdescription: "Ubuntu 12.04.4 LTS"
+    lsbdistrelease: "12.04"
+    lsbmajdistrelease: "12.04"
+    operatingsystemrelease: "12.04"
+    osfamily: Debian
+    rubyversion: "1.8.7"
+  provider_specifics:
+    vagrant_virtualbox:
+      box: 'puppetlabs/ubuntu-12.04-64-nocm'
+      box_url: 'https://vagrantcloud.com/puppetlabs/boxes/ubuntu-12.04-64-nocm'
+    vagrant_vmware_fusion:
+      box: 'puppetlabs/ubuntu-12.04-64-nocm'
+      box_url: 'https://vagrantcloud.com/puppetlabs/boxes/ubuntu-12.04-64-nocm'
+    vsphere:
+      template: 'ubuntu-1402-x86_64'
 'centos-70-x64':
  description: ""
  facts:
@@ -47,12 +74,39 @@
  provider_specifics:
    vagrant_virtualbox:
      box: 'puppetlabs/centos-7.0-64-nocm'
-      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm/versions/1.0.0/providers/virtualbox.box'
+      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm'
    vagrant_vmware_fusion:
      box: 'puppetlabs/centos-7.0-64-nocm'
-      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm/versions/1.0.0/providers/vmware_fusion.box'
+      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-7.0-64-nocm'
    vsphere:
      template: 'centos-7-x86_64'
+'centos-66-x64':
+  description: ""
+  facts:
+    kernelrelease: "2.6.32-504.8.1.el6.x86_64"
+    operatingsystem: CentOS
+    kernelmajversion: "2.6"
+    architecture: x86_64
+    facterversion: "2.4.1"
+    kernelversion: "2.6.32"
+    operatingsystemrelease: "6.6"
+    osfamily: RedHat
+    lsbmajdistrelease: "6"
+    lsbdistcodename: Final
+    lsbdistdescription: "CentOS release 6.6 (Final)"
+    lsbdistid: CentOS
+    lsbdistrelease: "6.6"
+    kernel: Linux
+    rubyversion: "1.8.7"
+  provider_specifics:
+    vagrant_virtualbox:
+      box: 'puppetlabs/centos-6.6-64-nocm'
+      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-6.6-64-nocm'
+    vagrant_vmware_fusion:
+      box: 'puppetlabs/centos-6.6-64-nocm'
+      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-6.6-64-nocm'
+    vsphere:
+      template: 'centos-6-x86_64'
 'centos-65-x64':
  description: ""
  facts:
@@ -74,9 +128,7 @@
  provider_specifics:
    vagrant_virtualbox:
      box: 'puppetlabs/centos-6.5-64-nocm'
-      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-6.5-64-nocm/versions/1.0.0/providers/virtualbox.box'
    vagrant_vmware_fusion:
      box: 'puppetlabs/centos-6.5-64-nocm'
-      box_url: 'https://atlas.hashicorp.com/puppetlabs/boxes/centos-6.5-64-nocm/versions/1.0.0/providers/vmware_fusion.box'
    vsphere:
      template: 'centos-6-x86_64'
--- a/README.md
+++ b/README.md
@@ -112,8 +112,8 @@ and tests are in spec/system. It runs virtual machines and requires
 * BUNDLE_PATH=/tmp/vendor bundle exec rake spec
 * git clone https://github.com/bodepd/scenario_node_terminus.git ../scenario_node_terminus
 * BUNDLE_PATH=/tmp/vendor bundle exec rake spec:system
-* BUNDLE_PATH=/tmp/vendor RS_SET=two-ubuntu-server-12042-x64 bundle exec rake spec:system
-* BUNDLE_PATH=/tmp/vendor RS_SET=two-centos-65-x64 bundle exec rake spec:system
+* BUNDLE_PATH=/tmp/vendor RS_SET=two-ubuntu-server-1204-x64 bundle exec rake spec:system
+* BUNDLE_PATH=/tmp/vendor RS_SET=two-centos-66-x64 bundle exec rake spec:system

 The RELEASES environment variable contains the list of ceph releases
 for which integration tests are going to be run. The default is
@@ -128,16 +128,16 @@ The RS_SET environment variable contains the resource set of linux
 distribution configurations for which integration tests are going
 to be run. Available values are

-* two-ubuntu-server-12042-x64
-* one-ubuntu-server-12042-x64
-* two-centos-65-x64
-* one-centos-65-x64
+* two-ubuntu-server-1204-x64
+* ubuntu-server-1204-x64
+* two-centos-66-x64
+* centos-66-x64

 The default is

 ```
 BUNDLE_PATH=/tmp/vendor \
-RS_SET=two-ubuntu-server-12042-x64 \
+RS_SET=two-ubuntu-server-1204-x64 \
 bundle exec rake spec:system
 ```

@@ -165,8 +165,8 @@ Example invocation of gerritexec:
 ```
 script='bash -c "'
 script+='mv Gemfile-rspec-system Gemfile ; bundle install ; '
-script+='RS_SET=two-ubuntu-server-12042-x64 bundle exec rake spec:system ; '
-script+='RS_SET=two-centos-65-x64 bundle exec rake spec:system ; '
+script+='RS_SET=two-ubuntu-server-1204-x64 bundle exec rake spec:system ; '
+script+='RS_SET=two-centos-66-x64 bundle exec rake spec:system ; '
 script+='" > /tmp/out 2>&1 ; r=$? ; '
 script+='echo https://pypi.python.org/pypi/gerritexec output: ; '
 script+='pastebinit /tmp/out ; '
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ b/spec/acceptance/nodesets/centos-65-x64.yml
@@ -6,8 +6,8 @@ HOSTS:
      - osd
      - client
    platform: el-6-x86_64
-    box: puppetlabs/centos-6.5-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.5-64-nocm
+    box: puppetlabs/centos-6.6-64-nocm
+    box_url: https://atlas.hashicorp.com/puppetlabs/boxes/centos-6.6-64-nocm
    hypervisor: vagrant
    ip: 10.11.12.2
 CONFIG:
--- a/spec/acceptance/nodesets/nodepool.yml
+++ b/spec/acceptance/nodesets/nodepool.yml
@@ -5,7 +5,7 @@ HOSTS:
      - mon
      - osd
      - client
-    platform: ubuntu-1204-amd64
+    platform: ubuntu-1404-amd64
    hypervisor: none
    ip: 127.0.0.1
 CONFIG:
--- a/spec/acceptance/nodesets/two-centos-66-x64.yml
+++ b/spec/acceptance/nodesets/two-centos-66-x64.yml
@@ -5,7 +5,7 @@ HOSTS:
      - mon
    platform: el-6-x86_64
    box: puppetlabs/centos-6.5-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.5-64-nocm
+    box_url: https://atlas.hashicorp.com/puppetlabs/boxes/centos-6.6-64-nocm
    hypervisor: vagrant
    ip: 10.11.12.2
  second:
@@ -14,7 +14,7 @@ HOSTS:
      - client
    platform: el-6-x86_64
    box: puppetlabs/centos-6.5-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.5-64-nocm
+    box_url: https://atlas.hashicorp.com/puppetlabs/boxes/centos-6.6-64-nocm
    hypervisor: vagrant
    ip: 10.11.12.3
 CONFIG:
--- a/spec/acceptance/nodesets/two-ubuntu-server-1204-x64.yml
+++ b/spec/acceptance/nodesets/two-ubuntu-server-1204-x64.yml
@@ -5,7 +5,7 @@ HOSTS:
      - mon
    platform: ubuntu-1204-amd64
    box: puppetlabs/ubuntu-12.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-12.04-64-nocm
+    box_url: https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-12.04-64-nocm
    hypervisor: vagrant
    ip: 10.11.12.2
  second:
@@ -14,7 +14,7 @@ HOSTS:
      - client
    platform: ubuntu-1204-amd64
    box: puppetlabs/ubuntu-12.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-12.04-64-nocm
+    box_url: https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-12.04-64-nocm
    hypervisor: vagrant
    ip: 10.11.12.3
 CONFIG:
--- a/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
+++ b/spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
@@ -7,7 +7,7 @@ HOSTS:
      - client
    platform: ubuntu-1204-amd64
    box: puppetlabs/ubuntu-12.04-64-nocm
-    box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-12.04-64-nocm
+    box_url: https://atlas.hashicorp.com/puppetlabs/boxes/ubuntu-12.04-64-nocm
    hypervisor: vagrant
    ip: 10.11.12.2
 CONFIG:
--- a/spec/system/ceph_key_spec.rb
+++ b/spec/system/ceph_key_spec.rb
@@ -228,7 +228,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -236,7 +236,7 @@ end
 #   MACHINES=first \
 #   RELEASES=dumpling \
 #   RS_DESTROY=no \
-#   RS_SET=one-ubuntu-server-12042-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_key_spec.rb &&
 #   git checkout Gemfile
--- a/spec/system/ceph_mon_spec.rb
+++ b/spec/system/ceph_mon_spec.rb
@@ -315,14 +315,14 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/two-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/two-ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
 #   BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
 #   RELEASES=dumpling \
 #   RS_DESTROY=no \
-#   RS_SET=two-ubuntu-server-12042-x64 \
+#   RS_SET=two-ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system \
 #          SPEC=spec/system/ceph_mon_spec.rb \
--- a/spec/system/ceph_mons_spec.rb
+++ b/spec/system/ceph_mons_spec.rb
@@ -481,7 +481,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -489,7 +489,7 @@ end
 #   RELEASES=dumpling \
 #   MACHINES=first \
 #   RS_DESTROY=no \
-#   RS_SET=one-ubuntu-server-12042-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system \
 #         SPEC=spec/system/ceph_mons_spec.rb \
--- a/spec/system/ceph_osd_spec.rb
+++ b/spec/system/ceph_osd_spec.rb
@@ -418,7 +418,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-centos-65-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -427,7 +427,7 @@ end
 #   RELEASES=dumpling \
 #   DATAS=/srv/data \
 #   RS_DESTROY=no \
-#   RS_SET=one-centos-65-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_osd_spec.rb &&
 #   git checkout Gemfile
--- a/spec/system/ceph_osds_spec.rb
+++ b/spec/system/ceph_osds_spec.rb
@@ -217,7 +217,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -225,7 +225,7 @@ end
 #   RELEASES=dumpling \
 #   MACHINES=first \
 #   RS_DESTROY=no \
-#   RS_SET=one-ubuntu-server-12042-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system \
 #         SPEC=spec/system/ceph_osds_spec.rb \
--- a/spec/system/ceph_pool_spec.rb
+++ b/spec/system/ceph_pool_spec.rb
@@ -145,7 +145,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -153,7 +153,7 @@ end
 #   MACHINES=first \
 #   RELEASES=dumpling \
 #   RS_DESTROY=no \
-#   RS_SET=one-ubuntu-server-12042-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_pool_spec.rb &&
 #   git checkout Gemfile
--- a/spec/system/ceph_profile_base_spec.rb
+++ b/spec/system/ceph_profile_base_spec.rb
@@ -117,7 +117,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -125,7 +125,7 @@ end
 #   MACHINES=first \
 #   RELEASES=dumpling \
 #   RS_DESTROY=no \
-#   RS_SET=one-ubuntu-server-12042-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_profile_base_spec.rb &&
 #   git checkout Gemfile
--- a/spec/system/ceph_profile_client_spec.rb
+++ b/spec/system/ceph_profile_client_spec.rb
@@ -176,13 +176,13 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/two-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/two-ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
 #   BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
 #   RELEASES=dumpling \
-#   RS_SET=two-ubuntu-server-12042-x64 \
+#   RS_SET=two-ubuntu-server-1204-x64 \
 #   RS_DESTROY=no \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_profile_client_spec.rb &&
--- a/spec/system/ceph_profile_mon_spec.rb
+++ b/spec/system/ceph_profile_mon_spec.rb
@@ -347,7 +347,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/two-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/two-ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -355,7 +355,7 @@ end
 #   MACHINES='first second' \
 #   RELEASES=dumpling \
 #   RS_DESTROY=no \
-#   RS_SET=two-ubuntu-server-12042-x64 \
+#   RS_SET=two-ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system \
 #          SPEC=spec/system/ceph_profile_mon_spec.rb \
--- a/spec/system/ceph_profile_osd_spec.rb
+++ b/spec/system/ceph_profile_osd_spec.rb
@@ -428,13 +428,13 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/two-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/two-ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
 #   BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
 #   RELEASES=dumpling \
-#   RS_SET=two-ubuntu-server-12042-x64 \
+#   RS_SET=two-ubuntu-server-1204-x64 \
 #   RS_DESTROY=no \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_profile_osd_spec.rb &&
--- a/spec/system/ceph_repo_spec.rb
+++ b/spec/system/ceph_repo_spec.rb
@@ -304,7 +304,7 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
@@ -312,7 +312,7 @@ end
 #   MACHINES=first \
 #   RELEASES=dumpling \
 #   RS_DESTROY=no \
-#   RS_SET=one-ubuntu-server-12042-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_repo_spec.rb &&
 #   git checkout Gemfile
--- a/spec/system/ceph_rgw_apache_spec.rb
+++ b/spec/system/ceph_rgw_apache_spec.rb
@@ -205,14 +205,14 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/one-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
 #   BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
 #   RELEASES=dumpling \
 #   RS_DESTROY=no \
-#   RS_SET=one-ubuntu-server-12042-x64 \
+#   RS_SET=ubuntu-server-1204-x64 \
 #   MACHINES=first \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system SPEC=spec/system/ceph_rgw_apache_spec.rb &&
--- a/spec/system/ceph_usecases_spec.rb
+++ b/spec/system/ceph_usecases_spec.rb
@@ -411,13 +411,13 @@ end
 # Local Variables:
 # compile-command: "cd ../..
 #   (
-#     cd .rspec_system/vagrant_projects/two-ubuntu-server-12042-x64
+#     cd .rspec_system/vagrant_projects/two-ubuntu-server-1204-x64
 #     vagrant destroy --force
 #   )
 #   cp -a Gemfile-rspec-system Gemfile
 #   BUNDLE_PATH=/tmp/vendor bundle install --no-deployment
 #   RS_DESTROY=no \
-#   RS_SET=two-ubuntu-server-12042-x64 \
+#   RS_SET=two-ubuntu-server-1204-x64 \
 #   BUNDLE_PATH=/tmp/vendor \
 #   bundle exec rake spec:system \
 #   SPEC=spec/system/ceph_usecases_spec.rb &&