diff options
Diffstat (limited to 'deploy/adapters')
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 1 | ||||
| -rwxr-xr-x | deploy/adapters/ansible/roles/config-osa/tasks/main.yml | 6 | ||||
| -rw-r--r-- | deploy/adapters/cobbler/snippets/kickstart_done | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index ffe07496..3132ab50 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -49,6 +49,7 @@ remote_user: root roles: - post-osa + - collectd - hosts: - neutron_openvswitch_agent diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index d96a83da..95bfbc02 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -277,3 +277,9 @@ line: "- include: repo_fix_pandas.yml" - include: meters.yml + +- name: fix the python-ldap version + lineinfile: + dest: /etc/ansible/roles/os_keystone/defaults/main.yml + regexp: '^ - python-ldap' + line: ' - python-ldap==2.5.2' diff --git a/deploy/adapters/cobbler/snippets/kickstart_done b/deploy/adapters/cobbler/snippets/kickstart_done index 2a936adb..aafcd76f 100644 --- a/deploy/adapters/cobbler/snippets/kickstart_done +++ b/deploy/adapters/cobbler/snippets/kickstart_done @@ -17,7 +17,7 @@ ## PXE JUST ONCE #if $pxe_just_once in [ "1", "true", "yes", "y" ] #if $breed == 'redhat' - #set nopxe = "\nwget \"http://%s/cblr/svc/op/nopxe/system/%s\" -O /var/log/nopxe" % (srv, system_name) + #set nopxe = "\ncurl \"http://%s/cblr/svc/op/nopxe/system/%s\" -O /var/log/nopxe" % (srv, system_name) #else if $breed == 'vmware' and $os_version == 'esx4' #set nopxe = "\ncurl \"http://%s/cblr/svc/op/nopxe/system/%s\" -o /var/log/nopxe" % (srv, system_name) #else if $breed == 'vmware' |