[MediaWiki-commits] [Gerrit] operations/puppet[production]: horizon: move standard/firewall include to role
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405987 ) Change subject: horizon: move standard/firewall include to role .. horizon: move standard/firewall include to role Change-Id: Icd6ff2fbe3bc3d826cb38ef607e86f6e0b30ca71 --- M manifests/site.pp M modules/role/manifests/wmcs/openstack/main/horizon.pp 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index 71bc824..0eda878 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -121,8 +121,6 @@ node 'californium.wikimedia.org' { role(striker::web) include ::role::wmcs::openstack::main::horizon -include ::standard -include ::base::firewall include ::ldap::role::client::labs interface::add_ip6_mapped { 'main': } diff --git a/modules/role/manifests/wmcs/openstack/main/horizon.pp b/modules/role/manifests/wmcs/openstack/main/horizon.pp index 9f1587b..20c5a98 100644 --- a/modules/role/manifests/wmcs/openstack/main/horizon.pp +++ b/modules/role/manifests/wmcs/openstack/main/horizon.pp @@ -2,6 +2,8 @@ # role::wmcs::openstack::main::web when labweb* is finished class role::wmcs::openstack::main::horizon { system::role { $name: } +include ::standard +include ::profile::base::firewall include ::profile::openstack::main::cloudrepo include ::profile::openstack::main::observerenv include ::profile::openstack::main::horizon::dashboard -- To view, visit https://gerrit.wikimedia.org/r/405987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd6ff2fbe3bc3d826cb38ef607e86f6e0b30ca71 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: horizon: move standard/firewall include to role
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405987 ) Change subject: horizon: move standard/firewall include to role .. horizon: move standard/firewall include to role Change-Id: Icd6ff2fbe3bc3d826cb38ef607e86f6e0b30ca71 --- M manifests/site.pp M modules/role/manifests/wmcs/openstack/main/horizon.pp 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/405987/1 diff --git a/manifests/site.pp b/manifests/site.pp index 71bc824..0eda878 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -121,8 +121,6 @@ node 'californium.wikimedia.org' { role(striker::web) include ::role::wmcs::openstack::main::horizon -include ::standard -include ::base::firewall include ::ldap::role::client::labs interface::add_ip6_mapped { 'main': } diff --git a/modules/role/manifests/wmcs/openstack/main/horizon.pp b/modules/role/manifests/wmcs/openstack/main/horizon.pp index 9f1587b..20c5a98 100644 --- a/modules/role/manifests/wmcs/openstack/main/horizon.pp +++ b/modules/role/manifests/wmcs/openstack/main/horizon.pp @@ -2,6 +2,8 @@ # role::wmcs::openstack::main::web when labweb* is finished class role::wmcs::openstack::main::horizon { system::role { $name: } +include ::standard +include ::profile::base::firewall include ::profile::openstack::main::cloudrepo include ::profile::openstack::main::observerenv include ::profile::openstack::main::horizon::dashboard -- To view, visit https://gerrit.wikimedia.org/r/405987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd6ff2fbe3bc3d826cb38ef607e86f6e0b30ca71 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits