diff --git a/defaults/main.yml b/defaults/main.yml index 703c6447..daae7cdc 100644 --- a/defaults/main.yml +++ b/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: diff --git a/tasks/octavia_flavor_create.yml b/tasks/octavia_flavor_create.yml index 24311948..fbbd5c66 100644 --- a/tasks/octavia_flavor_create.yml +++ b/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 \ No newline at end of file + - openstack_flavors | length > 0 diff --git a/tasks/octavia_mgmt_network.yml b/tasks/octavia_mgmt_network.yml index 1b289163..551d29c4 100644 --- a/tasks/octavia_mgmt_network.yml +++ b/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: diff --git a/tasks/octavia_security_group.yml b/tasks/octavia_security_group.yml index 115243c0..26e3af18 100644 --- a/tasks/octavia_security_group.yml +++ b/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: