Bump to latest ansible and deps
Ansible is pinned to single commit in devel branch to pull in the latest shade module we need (domain control). It will be available in ansible 2.1 TrivialFix Change-Id: I4c21fa1d2cec30d4aeb80e050ef4a62332f9ed45
This commit is contained in:
parent
5bbd578379
commit
a2fe37fe89
@ -8,7 +8,8 @@
|
||||
login_password='{{ database_password }}'
|
||||
name='haproxy'
|
||||
password=''
|
||||
host='%'"
|
||||
host='%'
|
||||
priv=*.*:USAGE"
|
||||
register: haproxy_user
|
||||
changed_when: "{{ haproxy_user.stdout.find('localhost | SUCCESS => ') != -1 and (haproxy_user.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
|
||||
until: haproxy_user.stdout.split()[2] == 'SUCCESS'
|
||||
|
@ -34,15 +34,15 @@ RUN apt-get -y --no-install-recommends install \
|
||||
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& pip --no-cache-dir install --upgrade wheel \
|
||||
&& pip --no-cache-dir install \
|
||||
MySQL-python \
|
||||
os-client-config==1.13.1 \
|
||||
os-client-config==1.16.0 \
|
||||
pyudev \
|
||||
shade==1.3.0
|
||||
shade==1.4.0
|
||||
|
||||
RUN git clone --depth 1 -b v2.0.0-0.7.rc2 https://github.com/ansible/ansible.git \
|
||||
RUN git clone https://github.com/ansible/ansible.git \
|
||||
&& cd ansible \
|
||||
&& git checkout 915037c628ddcdfebd3e266710460376fcfaa91d \
|
||||
&& git submodule update --init --recursive \
|
||||
&& pip --no-cache-dir install .
|
||||
|
||||
|
@ -50,6 +50,9 @@ def main():
|
||||
service = None
|
||||
endpoint = None
|
||||
|
||||
# bcoca broke the loader! bcoca is working on the loaded. until then...
|
||||
module.params['auth'] = json.loads(
|
||||
module.params['auth'].replace("'", '"'))
|
||||
cloud = shade.operator_cloud(**module.params)
|
||||
|
||||
for _service in cloud.keystone_client.services.list():
|
||||
|
@ -45,6 +45,9 @@ def main():
|
||||
role = None
|
||||
user = None
|
||||
|
||||
# bcoca broke the loader! bcoca is working on the loaded. until then...
|
||||
module.params['auth'] = json.loads(
|
||||
module.params['auth'].replace("'", '"'))
|
||||
cloud = shade.operator_cloud(**module.params)
|
||||
|
||||
for _project in cloud.keystone_client.tenants.list():
|
||||
|
Loading…
Reference in New Issue
Block a user