Drop pre_install and merge it into install

As we are adding binary deployments, it is no longer necessary
for the existance of pre_install for now.  Every install method
will have it's own pre_install inside it's install type tasks
file.

Change-Id: Ia8aadbae6da955912256ebdb97af0fd7a0673a9c

tasks/glance_install.yml

@@ -13,6 +13,76 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: create the system group
+  group:
+    name: "{{ glance_system_group_name }}"
+    gid: "{{ glance_system_group_gid | default(omit) }}"
+    state: "present"
+    system: "yes"
+
+- name: Create the glance system user
+  user:
+    name: "{{ glance_system_user_name }}"
+    uid: "{{ glance_system_user_uid | default(omit) }}"
+    group: "{{ glance_system_group_name }}"
+    comment: "{{ glance_system_comment }}"
+    shell: "{{ glance_system_shell }}"
+    system: "yes"
+    createhome: "yes"
+    home: "{{ glance_system_user_home }}"
+
+- name: Create glance NFS mount point(s)
+  file:
+    path: "{{ item.local_path }}"
+    state: directory
+    mode: "0755"
+  with_items: "{{ glance_nfs_client }}"
+
+- name: Create glance dir
+  file:
+    path: "{{ item.path }}"
+    state: directory
+    owner: "{{ item.owner|default(glance_system_user_name) }}"
+    group: "{{ item.group|default(glance_system_group_name) }}"
+    mode: "{{ item.mode|default(omit) }}"
+  with_items:
+    - { path: "/openstack", mode: "0755", owner: "root", group: "root" }
+    - { path: "/etc/glance", mode: "0750" }
+    - { path: "/var/cache/glance" }
+    - { path: "{{ glance_system_user_home }}" }
+    - { path: "{{ glance_system_user_home }}/cache/api", mode: "0700" }
+    - { path: "{{ glance_system_user_home }}/cache/registry" }
+    - { path: "{{ glance_system_user_home }}/scrubber" }
+
+- name: Create glance images dir
+  file:
+    path: "{{ glance_system_user_home }}/images/"
+    state: directory
+    owner: "{{ glance_system_user_name }}"
+    group: "{{ glance_system_group_name }}"
+    mode: "0755"
+
+- name: Test for log directory or link
+  shell: |
+    if [ -h "/var/log/glance"  ]; then
+      chown -h {{ glance_system_user_name }}:{{ glance_system_group_name }} "/var/log/glance"
+      chown -R {{ glance_system_user_name }}:{{ glance_system_group_name }} "$(readlink /var/log/glance)"
+    else
+      exit 1
+    fi
+  register: log_dir
+  failed_when: false
+  changed_when: log_dir.rc != 0
+
+- name: Create glance log dir
+  file:
+    path: "/var/log/glance"
+    state: directory
+    owner: "{{ glance_system_user_name }}"
+    group: "{{ glance_system_group_name }}"
+    mode: "0755"
+  when: log_dir.rc != 0
+
 - name: Install distro packages
   package:
     name: "{{ glance_distro_packages }}"

tasks/glance_pre_install.yml

@@ -1,84 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: create the system group
-  group:
-    name: "{{ glance_system_group_name }}"
-    gid: "{{ glance_system_group_gid | default(omit) }}"
-    state: "present"
-    system: "yes"
-
-- name: Create the glance system user
-  user:
-    name: "{{ glance_system_user_name }}"
-    uid: "{{ glance_system_user_uid | default(omit) }}"
-    group: "{{ glance_system_group_name }}"
-    comment: "{{ glance_system_comment }}"
-    shell: "{{ glance_system_shell }}"
-    system: "yes"
-    createhome: "yes"
-    home: "{{ glance_system_user_home }}"
-
-- name: Create glance NFS mount point(s)
-  file:
-    path: "{{ item.local_path }}"
-    state: directory
-    mode: "0755"
-  with_items: "{{ glance_nfs_client }}"
-
-- name: Create glance dir
-  file:
-    path: "{{ item.path }}"
-    state: directory
-    owner: "{{ item.owner|default(glance_system_user_name) }}"
-    group: "{{ item.group|default(glance_system_group_name) }}"
-    mode: "{{ item.mode|default(omit) }}"
-  with_items:
-    - { path: "/openstack", mode: "0755", owner: "root", group: "root" }
-    - { path: "/etc/glance", mode: "0750" }
-    - { path: "/var/cache/glance" }
-    - { path: "{{ glance_system_user_home }}" }
-    - { path: "{{ glance_system_user_home }}/cache/api", mode: "0700" }
-    - { path: "{{ glance_system_user_home }}/cache/registry" }
-    - { path: "{{ glance_system_user_home }}/scrubber" }
-
-- name: Create glance images dir
-  file:
-    path: "{{ glance_system_user_home }}/images/"
-    state: directory
-    owner: "{{ glance_system_user_name }}"
-    group: "{{ glance_system_group_name }}"
-    mode: "0755"
-
-- name: Test for log directory or link
-  shell: |
-    if [ -h "/var/log/glance"  ]; then
-      chown -h {{ glance_system_user_name }}:{{ glance_system_group_name }} "/var/log/glance"
-      chown -R {{ glance_system_user_name }}:{{ glance_system_group_name }} "$(readlink /var/log/glance)"
-    else
-      exit 1
-    fi
-  register: log_dir
-  failed_when: false
-  changed_when: log_dir.rc != 0
-
-- name: Create glance log dir
-  file:
-    path: "/var/log/glance"
-    state: directory
-    owner: "{{ glance_system_user_name }}"
-    group: "{{ glance_system_group_name }}"
-    mode: "0755"
-  when: log_dir.rc != 0

tasks/main.yml

@@ -25,10 +25,6 @@
   tags:
     - always
 
-- include_tasks: glance_pre_install.yml
-  tags:
-    - glance-install
-
 - include_tasks: glance_install.yml
   tags:
     - glance-install