Tim Landscheidt has uploaded a new change for review. https://gerrit.wikimedia.org/r/325479
Change subject: openstack: Fix puppet URLs in comments ...................................................................... openstack: Fix puppet URLs in comments Change-Id: I1ee6923c95dc8dd6c9c4c98d298c4cec54045a6e --- M modules/openstack/files/kilo/virtscripts/cold-migrate M modules/openstack/files/kilo/virtscripts/cold-nova-migrate M modules/openstack/files/kilo/virtscripts/live-migrate M modules/openstack/files/kilo/virtscripts/logstat.py M modules/openstack/files/kilo/virtscripts/prod.sh M modules/openstack/files/liberty/virtscripts/cold-migrate M modules/openstack/files/liberty/virtscripts/cold-nova-migrate M modules/openstack/files/liberty/virtscripts/live-migrate M modules/openstack/files/liberty/virtscripts/logstat.py M modules/openstack/files/liberty/virtscripts/makedomain M modules/openstack/files/liberty/virtscripts/prod.sh M modules/openstack/files/mitaka/virtscripts/cold-migrate M modules/openstack/files/mitaka/virtscripts/cold-nova-migrate M modules/openstack/files/mitaka/virtscripts/live-migrate M modules/openstack/files/mitaka/virtscripts/logstat.py M modules/openstack/files/mitaka/virtscripts/makedomain M modules/openstack/files/mitaka/virtscripts/prod.sh M modules/openstack/files/rabbitmq/labs-rabbitmq.default M modules/openstack/templates/common/wikitech.wikimedia.org.erb M modules/openstack/templates/kilo/horizon/horizon.wikimedia.org.erb M modules/openstack/templates/kilo/horizon/labtesthorizon.wikimedia.org.erb M modules/openstack/templates/kilo/horizon/local_settings.py.erb M modules/openstack/templates/liberty/horizon/horizon.wikimedia.org.erb M modules/openstack/templates/liberty/horizon/labtesthorizon.wikimedia.org.erb M modules/openstack/templates/liberty/horizon/local_settings.py.erb M modules/openstack/templates/mitaka/horizon/horizon.wikimedia.org.erb M modules/openstack/templates/mitaka/horizon/labtesthorizon.wikimedia.org.erb M modules/openstack/templates/mitaka/horizon/local_settings.py.erb 28 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/325479/1 diff --git a/modules/openstack/files/kilo/virtscripts/cold-migrate b/modules/openstack/files/kilo/virtscripts/cold-migrate index 6d2489e..d7d0587 100755 --- a/modules/openstack/files/kilo/virtscripts/cold-migrate +++ b/modules/openstack/files/kilo/virtscripts/cold-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/kilo/virtscripts/cold-migrate +# puppet:///openstack/kilo/virtscripts/cold-migrate ##################################################################### """ cold-migrate stops an instance, moves it to a new host, diff --git a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate index a1d19b8..27e5b71 100755 --- a/modules/openstack/files/kilo/virtscripts/cold-nova-migrate +++ b/modules/openstack/files/kilo/virtscripts/cold-nova-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/kilo/virtscripts/cold-nova-migrate +# puppet:///openstack/kilo/virtscripts/cold-nova-migrate ##################################################################### """ cold-nova-migrate is a not-very-smart wrapper around the standard diff --git a/modules/openstack/files/kilo/virtscripts/live-migrate b/modules/openstack/files/kilo/virtscripts/live-migrate index cb56095..855cbb8 100755 --- a/modules/openstack/files/kilo/virtscripts/live-migrate +++ b/modules/openstack/files/kilo/virtscripts/live-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/kilo/virtscripts/live-migrate +# puppet:///openstack/kilo/virtscripts/live-migrate ##################################################################### """ live-migrate is a wrapper around nova's built-in block migrate diff --git a/modules/openstack/files/kilo/virtscripts/logstat.py b/modules/openstack/files/kilo/virtscripts/logstat.py index 8e12c81..a99165b 100644 --- a/modules/openstack/files/kilo/virtscripts/logstat.py +++ b/modules/openstack/files/kilo/virtscripts/logstat.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/kilo/virtscripts/logstat.py +# puppet:///openstack/kilo/virtscripts/logstat.py ##################################################################### # encoding: utf-8 """ diff --git a/modules/openstack/files/kilo/virtscripts/prod.sh b/modules/openstack/files/kilo/virtscripts/prod.sh index 80b1a1e..758ff39 100644 --- a/modules/openstack/files/kilo/virtscripts/prod.sh +++ b/modules/openstack/files/kilo/virtscripts/prod.sh @@ -1,7 +1,7 @@ #!/bin/bash ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/kilo/virtscripts/prod.sh +### puppet:///openstack/kilo/virtscripts/prod.sh ##################################################################### set -x diff --git a/modules/openstack/files/liberty/virtscripts/cold-migrate b/modules/openstack/files/liberty/virtscripts/cold-migrate index f94c8ab..98c2211 100755 --- a/modules/openstack/files/liberty/virtscripts/cold-migrate +++ b/modules/openstack/files/liberty/virtscripts/cold-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/cold-migrate +# puppet:///openstack/liberty/virtscripts/cold-migrate ##################################################################### """ cold-migrate stops an instance, moves it to a new host, diff --git a/modules/openstack/files/liberty/virtscripts/cold-nova-migrate b/modules/openstack/files/liberty/virtscripts/cold-nova-migrate index ad0256f..bada0f6 100755 --- a/modules/openstack/files/liberty/virtscripts/cold-nova-migrate +++ b/modules/openstack/files/liberty/virtscripts/cold-nova-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/cold-nova-migrate +# puppet:///openstack/liberty/virtscripts/cold-nova-migrate ##################################################################### """ cold-nova-migrate is a not-very-smart wrapper around the standard diff --git a/modules/openstack/files/liberty/virtscripts/live-migrate b/modules/openstack/files/liberty/virtscripts/live-migrate index 7afa7c6..14afd0e 100755 --- a/modules/openstack/files/liberty/virtscripts/live-migrate +++ b/modules/openstack/files/liberty/virtscripts/live-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/live-migrate +# puppet:///openstack/liberty/virtscripts/live-migrate ##################################################################### """ live-migrate is a wrapper around nova's built-in block migrate diff --git a/modules/openstack/files/liberty/virtscripts/logstat.py b/modules/openstack/files/liberty/virtscripts/logstat.py index 22c3c51..1cab3d2 100644 --- a/modules/openstack/files/liberty/virtscripts/logstat.py +++ b/modules/openstack/files/liberty/virtscripts/logstat.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/logstat.py +# puppet:///openstack/liberty/virtscripts/logstat.py ##################################################################### # encoding: utf-8 """ diff --git a/modules/openstack/files/liberty/virtscripts/makedomain b/modules/openstack/files/liberty/virtscripts/makedomain index 6f987cc..e9ef4ff 100755 --- a/modules/openstack/files/liberty/virtscripts/makedomain +++ b/modules/openstack/files/liberty/virtscripts/makedomain @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/makedomain +# puppet:///openstack/liberty/virtscripts/makedomain ##################################################################### """ makedomain is a tool for creating subdomains of existing designate domains. diff --git a/modules/openstack/files/liberty/virtscripts/prod.sh b/modules/openstack/files/liberty/virtscripts/prod.sh index d6badd9..af257fe 100644 --- a/modules/openstack/files/liberty/virtscripts/prod.sh +++ b/modules/openstack/files/liberty/virtscripts/prod.sh @@ -1,7 +1,7 @@ #!/bin/bash ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/liberty/virtscripts/prod.sh +### puppet:///openstack/liberty/virtscripts/prod.sh ##################################################################### set -x diff --git a/modules/openstack/files/mitaka/virtscripts/cold-migrate b/modules/openstack/files/mitaka/virtscripts/cold-migrate index f94c8ab..1d7b270 100755 --- a/modules/openstack/files/mitaka/virtscripts/cold-migrate +++ b/modules/openstack/files/mitaka/virtscripts/cold-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/cold-migrate +# puppet:///openstack/mitaka/virtscripts/cold-migrate ##################################################################### """ cold-migrate stops an instance, moves it to a new host, diff --git a/modules/openstack/files/mitaka/virtscripts/cold-nova-migrate b/modules/openstack/files/mitaka/virtscripts/cold-nova-migrate index ad0256f..6114322 100755 --- a/modules/openstack/files/mitaka/virtscripts/cold-nova-migrate +++ b/modules/openstack/files/mitaka/virtscripts/cold-nova-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/cold-nova-migrate +# puppet:///openstack/mitaka/virtscripts/cold-nova-migrate ##################################################################### """ cold-nova-migrate is a not-very-smart wrapper around the standard diff --git a/modules/openstack/files/mitaka/virtscripts/live-migrate b/modules/openstack/files/mitaka/virtscripts/live-migrate index 7afa7c6..1ce953f 100755 --- a/modules/openstack/files/mitaka/virtscripts/live-migrate +++ b/modules/openstack/files/mitaka/virtscripts/live-migrate @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/live-migrate +# puppet:///openstack/mitaka/virtscripts/live-migrate ##################################################################### """ live-migrate is a wrapper around nova's built-in block migrate diff --git a/modules/openstack/files/mitaka/virtscripts/logstat.py b/modules/openstack/files/mitaka/virtscripts/logstat.py index 22c3c51..916173c 100644 --- a/modules/openstack/files/mitaka/virtscripts/logstat.py +++ b/modules/openstack/files/mitaka/virtscripts/logstat.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/logstat.py +# puppet:///openstack/mitaka/virtscripts/logstat.py ##################################################################### # encoding: utf-8 """ diff --git a/modules/openstack/files/mitaka/virtscripts/makedomain b/modules/openstack/files/mitaka/virtscripts/makedomain index 6f987cc..b5e3879 100755 --- a/modules/openstack/files/mitaka/virtscripts/makedomain +++ b/modules/openstack/files/mitaka/virtscripts/makedomain @@ -1,7 +1,7 @@ #!/usr/bin/python ##################################################################### # THIS FILE IS MANAGED BY PUPPET -# puppet:///modules/openstack/liberty/virtscripts/makedomain +# puppet:///openstack/mitaka/virtscripts/makedomain ##################################################################### """ makedomain is a tool for creating subdomains of existing designate domains. diff --git a/modules/openstack/files/mitaka/virtscripts/prod.sh b/modules/openstack/files/mitaka/virtscripts/prod.sh index d6badd9..2626c4f 100644 --- a/modules/openstack/files/mitaka/virtscripts/prod.sh +++ b/modules/openstack/files/mitaka/virtscripts/prod.sh @@ -1,7 +1,7 @@ #!/bin/bash ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/liberty/virtscripts/prod.sh +### puppet:///openstack/mitaka/virtscripts/prod.sh ##################################################################### set -x diff --git a/modules/openstack/files/rabbitmq/labs-rabbitmq.default b/modules/openstack/files/rabbitmq/labs-rabbitmq.default index 0592815..939620c 100644 --- a/modules/openstack/files/rabbitmq/labs-rabbitmq.default +++ b/modules/openstack/files/rabbitmq/labs-rabbitmq.default @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/rabbitmq/labs-rabbitmq.default +### puppet:///openstack/rabbitmq/labs-rabbitmq.default ##################################################################### diff --git a/modules/openstack/templates/common/wikitech.wikimedia.org.erb b/modules/openstack/templates/common/wikitech.wikimedia.org.erb index d972c72..29dfec1 100644 --- a/modules/openstack/templates/common/wikitech.wikimedia.org.erb +++ b/modules/openstack/templates/common/wikitech.wikimedia.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/templates/common/wikitech.wikimedia.org +### puppet:///openstack/common/wikitech.wikimedia.org.erb ##################################################################### # vim: filetype=apache diff --git a/modules/openstack/templates/kilo/horizon/horizon.wikimedia.org.erb b/modules/openstack/templates/kilo/horizon/horizon.wikimedia.org.erb index 9041950..d6e789e 100644 --- a/modules/openstack/templates/kilo/horizon/horizon.wikimedia.org.erb +++ b/modules/openstack/templates/kilo/horizon/horizon.wikimedia.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///openstack/horizon.wikimedia.org +### puppet:///openstack/kilo/horizon/horizon.wikimedia.org.erb ##################################################################### # vim: filetype=apache diff --git a/modules/openstack/templates/kilo/horizon/labtesthorizon.wikimedia.org.erb b/modules/openstack/templates/kilo/horizon/labtesthorizon.wikimedia.org.erb index 9041950..761c259 100644 --- a/modules/openstack/templates/kilo/horizon/labtesthorizon.wikimedia.org.erb +++ b/modules/openstack/templates/kilo/horizon/labtesthorizon.wikimedia.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///openstack/horizon.wikimedia.org +### puppet:///openstack/kilo/horizon/labtesthorizon.wikimedia.org.erb ##################################################################### # vim: filetype=apache diff --git a/modules/openstack/templates/kilo/horizon/local_settings.py.erb b/modules/openstack/templates/kilo/horizon/local_settings.py.erb index 55fc36a..ca0e761 100644 --- a/modules/openstack/templates/kilo/horizon/local_settings.py.erb +++ b/modules/openstack/templates/kilo/horizon/local_settings.py.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/templates/icehouse/horizon/local_settings.py.erb +### puppet:///openstack/kilo/horizon/local_settings.py.erb ##################################################################### import os diff --git a/modules/openstack/templates/liberty/horizon/horizon.wikimedia.org.erb b/modules/openstack/templates/liberty/horizon/horizon.wikimedia.org.erb index 9041950..56fd26d 100644 --- a/modules/openstack/templates/liberty/horizon/horizon.wikimedia.org.erb +++ b/modules/openstack/templates/liberty/horizon/horizon.wikimedia.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///openstack/horizon.wikimedia.org +### puppet:///openstack/liberty/horizon/horizon.wikimedia.org.erb ##################################################################### # vim: filetype=apache diff --git a/modules/openstack/templates/liberty/horizon/labtesthorizon.wikimedia.org.erb b/modules/openstack/templates/liberty/horizon/labtesthorizon.wikimedia.org.erb index 9041950..dda5c47 100644 --- a/modules/openstack/templates/liberty/horizon/labtesthorizon.wikimedia.org.erb +++ b/modules/openstack/templates/liberty/horizon/labtesthorizon.wikimedia.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///openstack/horizon.wikimedia.org +### puppet:///openstack/liberty/horizon/labtesthorizon.wikimedia.org.erb ##################################################################### # vim: filetype=apache diff --git a/modules/openstack/templates/liberty/horizon/local_settings.py.erb b/modules/openstack/templates/liberty/horizon/local_settings.py.erb index 7499586..a699c20 100644 --- a/modules/openstack/templates/liberty/horizon/local_settings.py.erb +++ b/modules/openstack/templates/liberty/horizon/local_settings.py.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/templates/liberty/horizon/local_settings.py.erb +### puppet:///openstack/liberty/horizon/local_settings.py.erb ##################################################################### import os diff --git a/modules/openstack/templates/mitaka/horizon/horizon.wikimedia.org.erb b/modules/openstack/templates/mitaka/horizon/horizon.wikimedia.org.erb index 9041950..a5cd1b3 100644 --- a/modules/openstack/templates/mitaka/horizon/horizon.wikimedia.org.erb +++ b/modules/openstack/templates/mitaka/horizon/horizon.wikimedia.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///openstack/horizon.wikimedia.org +### puppet:///openstack/mitaka/horizon/horizon.wikimedia.org.erb ##################################################################### # vim: filetype=apache diff --git a/modules/openstack/templates/mitaka/horizon/labtesthorizon.wikimedia.org.erb b/modules/openstack/templates/mitaka/horizon/labtesthorizon.wikimedia.org.erb index 9041950..4607696 100644 --- a/modules/openstack/templates/mitaka/horizon/labtesthorizon.wikimedia.org.erb +++ b/modules/openstack/templates/mitaka/horizon/labtesthorizon.wikimedia.org.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///openstack/horizon.wikimedia.org +### puppet:///openstack/mitaka/horizon/labtesthorizon.wikimedia.org.erb ##################################################################### # vim: filetype=apache diff --git a/modules/openstack/templates/mitaka/horizon/local_settings.py.erb b/modules/openstack/templates/mitaka/horizon/local_settings.py.erb index 7499586..6c49ef1 100644 --- a/modules/openstack/templates/mitaka/horizon/local_settings.py.erb +++ b/modules/openstack/templates/mitaka/horizon/local_settings.py.erb @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///modules/openstack/templates/liberty/horizon/local_settings.py.erb +### puppet:///openstack/mitaka/horizon/local_settings.py.erb ##################################################################### import os -- To view, visit https://gerrit.wikimedia.org/r/325479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ee6923c95dc8dd6c9c4c98d298c4cec54045a6e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
