create os-image-upload role and change the order of

os-image-api and os-image-registry roles.

Create a new role os-image-upload and change the execution order of
os-image-api and os-image-registry roles in os-image role to make sure
the os-image-api role is executed before os-image-registry role since
glance db_sync use the sql_connection value in
/etc/glance/glance-api.conf.
Add os-image-upload to infrastructure.yml.
Remove the image_upload attribute from environments.

Change-Id: I218b52e1fd0ca68849e6aebd8bac6d8878790fba
Closes-Bug: #1257169

environments/example.rb

@@ -10,7 +10,6 @@ override_attributes(
     "developer_mode" => true
   }
   # "glance" => {
-  #   "image_upload" => true,
   #   "images" => ["precise","cirros"],
   #   "image" => {
   #     "cirros" => "http://hypnotoad/cirros-0.3.0-x86_64-disk.img",

environments/testing.rb

@@ -221,7 +221,6 @@ override_attributes(
       },
       "debug" => true,
       "identity_service_chef_role" => "os-identity",
-      "image_upload" => true,
       "rabbit_server_chef_role" => "os-ops-messaging",
       "registry" => {
         "bind_interface" => "eth0"

environments/vagrant.rb

@@ -14,7 +14,6 @@ override_attributes(
       },
     },
     "image" => {
-      "image_upload" => true,
       "upload_images" => ["cirros"],
       "upload_image" => {
         "cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"

infrastructure.yml

@@ -29,6 +29,7 @@ roles:
 - os-image:
 - os-image-api:
 - os-image-registry:
+- os-image-upload:
 - os-metering-agent-central:
 - os-metering-agent-compute:
 - os-metering-api:

roles/os-image-upload.rb

@@ -0,0 +1,6 @@
+name "os-image-upload"
+description "Glance image upload"
+run_list(
+  "role[os-base]",
+  "recipe[openstack-image::image_upload]"
+  )

roles/os-image.rb

@@ -2,6 +2,6 @@ name "os-image"
 description "Roll-up role for Glance."
 run_list(
   "recipe[openstack-image::identity_registration]",
-  "role[os-image-registry]",
-  "role[os-image-api]"
+  "role[os-image-api]",
+  "role[os-image-registry]"
   )