diff --git a/inventory/groups.yaml b/inventory/groups.yaml index bd05bc8185..7cc06dc986 100644 --- a/inventory/groups.yaml +++ b/inventory/groups.yaml @@ -145,7 +145,6 @@ groups: - pbx[0-9]*.opendev.org - planet[0-9]*.open*.org - refstack*.open*.org - - review[0-9]*.open*.org - static*.openstack.org - status*.open*.org - storyboard-dev[0-9]*.opendev.org @@ -193,7 +192,6 @@ groups: - pbx[0-9]*.opendev.org - planet[0-9]*.open*.org - refstack*.open*.org - - review[0-9]*.open*.org - static*.openstack.org - status*.open*.org - storyboard[0-9]*.opendev.org diff --git a/manifests/site.pp b/manifests/site.pp index 8ea44c82e3..f95aa64f37 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -25,52 +25,6 @@ node default { } } -# -# Long lived servers: -# -# Node-OS: xenial -node /^review\d*\.open.*\.org$/ { - $group = "review" - - class { 'openstack_project::server': } - - class { 'openstack_project::review': - project_config_repo => 'https://opendev.org/openstack/project-config', - github_oauth_token => hiera('gerrit_github_token'), - github_project_username => hiera('github_project_username', 'username'), - github_project_password => hiera('github_project_password'), - mysql_host => hiera('gerrit_mysql_host', 'localhost'), - mysql_password => hiera('gerrit_mysql_password'), - email_private_key => hiera('gerrit_email_private_key'), - token_private_key => hiera('gerrit_rest_token_private_key'), - gerritbot_password => hiera('gerrit_gerritbot_password'), - gerritbot_ssh_rsa_key_contents => hiera('gerritbot_ssh_rsa_key_contents'), - gerritbot_ssh_rsa_pubkey_contents => hiera('gerritbot_ssh_rsa_pubkey_contents'), - # Empty contents forces Puppet to not write the file. - ssl_cert_file_contents => '', - ssl_key_file_contents => '', - ssl_chain_file_contents => '', - ssl_cert_file => '/etc/letsencrypt-certs/review.opendev.org/review.opendev.org.cer', - ssl_key_file => '/etc/letsencrypt-certs/review.opendev.org/review.opendev.org.key', - ssl_chain_file => '/etc/letsencrypt-certs/review.opendev.org/ca.cer', - ssh_dsa_key_contents => hiera('gerrit_ssh_dsa_key_contents'), - ssh_dsa_pubkey_contents => hiera('gerrit_ssh_dsa_pubkey_contents'), - ssh_rsa_key_contents => hiera('gerrit_ssh_rsa_key_contents'), - ssh_rsa_pubkey_contents => hiera('gerrit_ssh_rsa_pubkey_contents'), - ssh_project_rsa_key_contents => hiera('gerrit_project_ssh_rsa_key_contents'), - ssh_project_rsa_pubkey_contents => hiera('gerrit_project_ssh_rsa_pubkey_contents'), - ssh_welcome_rsa_key_contents => hiera('welcome_message_gerrit_ssh_private_key'), - ssh_welcome_rsa_pubkey_contents => hiera('welcome_message_gerrit_ssh_public_key'), - ssh_replication_rsa_key_contents => hiera('gerrit_replication_ssh_rsa_key_contents'), - ssh_replication_rsa_pubkey_contents => hiera('gerrit_replication_ssh_rsa_pubkey_contents'), - lp_access_token => hiera('gerrit_lp_access_token'), - lp_access_secret => hiera('gerrit_lp_access_secret'), - lp_consumer_key => hiera('gerrit_lp_consumer_key'), - swift_username => hiera('swift_store_user', 'username'), - swift_password => hiera('swift_store_key'), - storyboard_password => hiera('gerrit_storyboard_token'), - } -} # Node-OS: xenial # Puppet-Version: !3 diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index bd4a45e964..f6e6c6b11a 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -5,12 +5,6 @@ - install-docker - gitea -- hosts: "review:!disabled" - name: "Base: install and configure puppet on puppet hosts" - roles: - - puppet-install - - disable-puppet-agent - - hosts: "localhost:!disabled" name: "Puppet-git: Collect the project-config ref" strategy: free @@ -31,11 +25,9 @@ - gitea-git-repos - hosts: "review:!disabled" - name: "Puppet-git: Run puppet on the Gerrit server" - strategy: free - gather_facts: true + name: "Configure gerrit" roles: - - role: puppet - facts: - project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" - puppet_timeout: 60m + - install-docker + - role: gerrit + gerrit_run_compose_up: false + gerrit_run_init: false diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml index 2b7ec55834..ff78818e3e 100644 --- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml +++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml @@ -52,8 +52,6 @@ results: review01.openstack.org: - gerrit - letsencrypt - - puppet - - puppet4 - review backup01.ord.rax.ci.openstack.org: