diff --git a/modules/pypimirror/manifests/init.pp b/modules/pypimirror/manifests/init.pp index 783c447712..0ec673984c 100644 --- a/modules/pypimirror/manifests/init.pp +++ b/modules/pypimirror/manifests/init.pp @@ -45,7 +45,7 @@ class pypimirror ( $base_url, owner => "root", } - file { '/home/gerrit2/projects.yaml': + file { '/etc/openstackci/projects.yaml': owner => 'root', group => 'root', mode => 444, @@ -63,6 +63,15 @@ class pypimirror ( $base_url, require => File['/usr/local/mirror_scripts'], } + file { '/usr/local/mirror_scripts/run_mirror.py': + ensure => present, + mode => 755, + owner => 'root', + group => 'root', + source => "puppet:///modules/pypimirror/run_mirror.py", + require => File['/usr/local/mirror_scripts'], + } + file { '/usr/local/mirror_scripts/pull-repo.sh': ensure => present, mode => 755, diff --git a/modules/pypimirror/templates/run-mirror.sh.erb b/modules/pypimirror/templates/run-mirror.sh.erb index 2fdce0e180..0c2b25bbcb 100644 --- a/modules/pypimirror/templates/run-mirror.sh.erb +++ b/modules/pypimirror/templates/run-mirror.sh.erb @@ -6,5 +6,5 @@ export PIP_DOWNLOAD_CACHE=<%= pip_cache %> export PIP_TEMP_DOWNLOAD=<%= pip_download %> export MIRROR_FILE_PATH=<%= mirror_file_path %> export LOG_FILENAME=<%= log_filename %> -python /usr/local/mirror_scripts/run-mirror.py <%= git_source %> >>$LOG_FILENAME +python /usr/local/mirror_scripts/run_mirror.py <%= git_source %> >>$LOG_FILENAME python /usr/local/mirror_scripts/process_cache.py ${PIP_DOWNLOAD_CACHE} ${MIRROR_FILE_PATH}