Merge "Move shade to octavia_requires_pip_packages"

defaults/main.yml

@@ -143,10 +143,11 @@ octavia_plugin_dirs:
 
 # octavia packages that must be installed before anything else
 octavia_requires_pip_packages:
+  - httplib2
+  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
+  - shade
   - virtualenv
   - virtualenv-tools
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-  - httplib2
 
 # Common pip packages
 octavia_pip_packages:

tasks/octavia_flavor_create.yml

@@ -13,16 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Install shade
-  pip:
-    name: shade
-    state: "{{ octavia_pip_package_state }}"
-    extra_args: "{{ pip_install_options | default('') }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-
 - name: Create Octavia Flavor
   os_nova_flavor:
     auth:
@@ -63,4 +53,4 @@
   set_fact:
      octavia_nova_flavor_uuid: "{{ openstack_flavors[0].id }}"
   when:
-    - openstack_flavors | length > 0
+    - openstack_flavors | length > 0

tasks/octavia_mgmt_network.yml

@@ -13,16 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Install shade
-  pip:
-    name: shade
-    state: "{{ octavia_pip_package_state }}"
-    extra_args: "{{ pip_install_options | default('') }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-
 - name: Get neutron network
   os_networks_facts:
     auth:

tasks/octavia_security_group.yml

@@ -13,16 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Install shade
-  pip:
-    name: shade
-    state: "{{ octavia_pip_package_state }}"
-    extra_args: "{{ pip_install_options | default('') }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-
 - name: Create Octavia security group
   os_security_group:
     auth: