openstack
/
project-config
Code Issues Proposed changes

Fix more fixes for legacy-install-afs-with-puppet role 

We actually want to use the copy task to make sure manifest.pp is
added on the remote node.

We also need to use SOURCE_MODULES otherwise install_modules.sh
doesn't work properly.

Set SETUP_PIP: false, as we already have pip installed into DIBs.

Change-Id: I5bb970a031121d80f73b1efb9dffc07dace67b73
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-09-22 18:35:48 -04:00
parent cc35a28c7e
commit 94a988033a
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/legacy-install-afs-with-puppet/tasks/main.yaml
View File

@ -1,7 +1,10 @@
- name: Install puppet
command: ./install_puppet.sh
shell: ./install_puppet.sh
args:
chdir: "{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/system-config"
environment:
# Skip setting up pip, our images have already done this.
SETUP_PIP: false
become: yes
- name: Copy reduced scope modules.env into place
@ -16,7 +19,7 @@
become: yes
- name: Copy manifest
file:
copy:
src: manifest.pp
dest: "{{ ansible_user_dir }}/manifest.pp"

5
roles/legacy-install-afs-with-puppet/templates/modules.env.j2
View File

@ -15,7 +15,6 @@
OPENSTACK_GIT_ROOT={{ ansible_user_dir }}/src/git.openstack.org
# Add modules that should be part of the openstack-infra integration test here
# Please keep sorted
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-kerberos"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openafs"]="origin/master"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-kerberos"]="origin/master"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openafs"]="origin/master"