Merge "Update opendev git references in puppet modules"

This commit is contained in:
Zuul 2019-04-20 21:00:37 +00:00 committed by Gerrit Code Review
commit e3bf7f2591
12 changed files with 15 additions and 15 deletions

View File

@ -6,7 +6,7 @@
tasks: tasks:
- name: Clone project-config - name: Clone project-config
git: git:
repo: https://git.openstack.org/openstack-infra/project-config repo: https://opendev.org/openstack/project-config
dest: "{{ project_config_dest }}" dest: "{{ project_config_dest }}"
version: "{{ project_config_ref }}" version: "{{ project_config_ref }}"
- name: Get Gerrit project list - name: Get Gerrit project list

View File

@ -1,5 +1,5 @@
# This file is managed by puppet. # This file is managed by puppet.
# https://git.openstack.org/cgit/openstack-infra/system-config # https://opendev.org/opendev/system-config
[ca] [ca]
default_ca = CA_default default_ca = CA_default

View File

@ -122,7 +122,7 @@ class openstack_project::ask (
ensure => present, ensure => present,
path => '/srv/askbot-site/themes', path => '/srv/askbot-site/themes',
branch => 'master', branch => 'master',
origin => 'https://git.openstack.org/openstack-infra/askbot-theme', origin => 'https://opendev.org/opendev/askbot-theme',
latest => true, latest => true,
require => [ require => [
File['/srv/askbot-site'], Package['git'] File['/srv/askbot-site'], Package['git']

View File

@ -114,7 +114,7 @@ class openstack_project::ask_staging (
ensure => present, ensure => present,
path => '/srv/askbot-site/themes', path => '/srv/askbot-site/themes',
branch => 'feature/development', branch => 'feature/development',
origin => 'https://git.openstack.org/openstack-infra/askbot-theme', origin => 'https://opendev.org/opendev/askbot-theme',
latest => true, latest => true,
require => [ require => [
File['/srv/askbot-site'], Package['git'] File['/srv/askbot-site'], Package['git']

View File

@ -32,7 +32,7 @@ class openstack_project::groups (
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://git.openstack.org/openstack-infra/groups-static-pages', source => 'https://opendev.org/osf/groups-static-pages',
} }
class { 'drupal': class { 'drupal':

View File

@ -31,7 +31,7 @@ class openstack_project::groups_dev (
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://git.openstack.org/openstack-infra/groups-static-pages', source => 'https://opendev.org/osf/groups-static-pages',
} }
class { 'drupal': class { 'drupal':

View File

@ -17,7 +17,7 @@
class openstack_project::logstash_worker ( class openstack_project::logstash_worker (
$discover_node = 'elasticsearch01.openstack.org', $discover_node = 'elasticsearch01.openstack.org',
$filter_rev = 'master', $filter_rev = 'master',
$filter_source = 'https://git.openstack.org/openstack/logstash-filters', $filter_source = 'https://opendev.org/openstack/logstash-filters',
$enable_mqtt = true, $enable_mqtt = true,
$mqtt_hostname = 'firehose.openstack.org', $mqtt_hostname = 'firehose.openstack.org',
$mqtt_port = 8883, $mqtt_port = 8883,

View File

@ -545,7 +545,7 @@ class openstack_project::mirror_update (
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://git.openstack.org/openstack-infra/afsmon', source => 'https://opendev.org/opendev/afsmon',
} }
python::virtualenv { '/usr/afsmon-env': python::virtualenv { '/usr/afsmon-env':

View File

@ -6,6 +6,6 @@ class openstack_project::planet (
include ::planet include ::planet
planet::site { 'openstack': planet::site { 'openstack':
git_url => 'https://git.openstack.org/openstack/openstack-planet', git_url => 'https://opendev.org/openstack/openstack-planet',
} }
} }

View File

@ -221,7 +221,7 @@ class openstack_project::static (
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://git.openstack.org/openstack-infra/devstack-gate', source => 'https://opendev.org/openstack/devstack-gate',
} }
file { '/srv/static/logs/help': file { '/srv/static/logs/help':
@ -252,7 +252,7 @@ class openstack_project::static (
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://git.openstack.org/openstack-infra/tripleo-ci', source => 'https://opendev.org/openstack/tripleo-ci',
} }
file { '/srv/static/logs/help/tripleo-quickstart-logs.html': file { '/srv/static/logs/help/tripleo-quickstart-logs.html':
ensure => present, ensure => present,
@ -450,7 +450,7 @@ class openstack_project::static (
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://git.openstack.org/openstack-infra/trystack-site', source => 'https://opendev.org/x/trystack-site',
} }
########################################################### ###########################################################

View File

@ -170,7 +170,7 @@ class openstack_project::status (
include reviewday include reviewday
reviewday::site { 'reviewday': reviewday::site { 'reviewday':
git_url => 'https://git.openstack.org/openstack-infra/reviewday', git_url => 'https://opendev.org/openstack/reviewday',
serveradmin => 'webmaster@openstack.org', serveradmin => 'webmaster@openstack.org',
httproot => '/srv/static/reviewday', httproot => '/srv/static/reviewday',
gerrit_url => 'review.openstack.org', gerrit_url => 'review.openstack.org',
@ -187,7 +187,7 @@ class openstack_project::status (
include bugdaystats include bugdaystats
bugdaystats::site { 'bugdaystats': bugdaystats::site { 'bugdaystats':
git_url => 'https://git.openstack.org/openstack-infra/bugdaystats', git_url => 'https://opendev.org/openstack/bugdaystats',
serveradmin => 'webmaster@openstack.org', serveradmin => 'webmaster@openstack.org',
httproot => '/srv/static/bugdaystats', httproot => '/srv/static/bugdaystats',
configfile => '/var/lib/bugdaystats/config.js', configfile => '/var/lib/bugdaystats/config.js',

View File

@ -4,7 +4,7 @@
"author": "Openstack CI", "author": "Openstack CI",
"summary": "Puppet module for openstack_project", "summary": "Puppet module for openstack_project",
"license": "Apache 2.0", "license": "Apache 2.0",
"source": "https://git.openstack.org/openstack-infra/system-config.git", "source": "https://opendev.org/opendev/system-config.git",
"project_page": "http://docs.openstack.org/infra/system-config/", "project_page": "http://docs.openstack.org/infra/system-config/",
"issues_url": "https://storyboard.openstack.org/#!/project/778", "issues_url": "https://storyboard.openstack.org/#!/project/778",
"dependencies": [] "dependencies": []