Move shade to octavia_requires_pip_packages
Remove duplicate tasks installing the shade package throughout different task files within the role, and instead install it through the octavia_requires_pip_packages list. Change-Id: Ib6936550bf76b46647c339b43f23dbed102aeb1d
This commit is contained in:
parent
28ad466472
commit
c802e8633b
@ -143,10 +143,11 @@ octavia_plugin_dirs:
|
|||||||
|
|
||||||
# octavia packages that must be installed before anything else
|
# octavia packages that must be installed before anything else
|
||||||
octavia_requires_pip_packages:
|
octavia_requires_pip_packages:
|
||||||
|
- httplib2
|
||||||
|
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
||||||
|
- shade
|
||||||
- virtualenv
|
- virtualenv
|
||||||
- virtualenv-tools
|
- virtualenv-tools
|
||||||
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
|
||||||
- httplib2
|
|
||||||
|
|
||||||
# Common pip packages
|
# Common pip packages
|
||||||
octavia_pip_packages:
|
octavia_pip_packages:
|
||||||
|
@ -13,16 +13,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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
|
- name: Create Octavia Flavor
|
||||||
os_nova_flavor:
|
os_nova_flavor:
|
||||||
auth:
|
auth:
|
||||||
@ -63,4 +53,4 @@
|
|||||||
set_fact:
|
set_fact:
|
||||||
octavia_nova_flavor_uuid: "{{ openstack_flavors[0].id }}"
|
octavia_nova_flavor_uuid: "{{ openstack_flavors[0].id }}"
|
||||||
when:
|
when:
|
||||||
- openstack_flavors | length > 0
|
- openstack_flavors | length > 0
|
||||||
|
@ -13,16 +13,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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
|
- name: Get neutron network
|
||||||
os_networks_facts:
|
os_networks_facts:
|
||||||
auth:
|
auth:
|
||||||
|
@ -13,16 +13,6 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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
|
- name: Create Octavia security group
|
||||||
os_security_group:
|
os_security_group:
|
||||||
auth:
|
auth:
|
||||||
|
Loading…
Reference in New Issue
Block a user