Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/315204
Change subject: Convert hiera to the form expected by the new backend ...................................................................... Convert hiera to the form expected by the new backend Bug: T147403 Change-Id: I65e1ae278878f38330d28658385579811ca32cc0 --- M hieradata/codfw/labtest-instances.yaml M hieradata/codfw/postgresql/slave.yaml M hieradata/common/conftool.yaml M hieradata/common/etcd/auth/common.yaml M hieradata/common/icinga/monitor/gsb.yaml M hieradata/common/puppetdb/password.yaml M hieradata/common/swift/params.yaml M hieradata/eqiad/cdh/hue.yaml M hieradata/eqiad/osm.yaml 9 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/04/315204/1 diff --git a/hieradata/codfw/labtest-instances.yaml b/hieradata/codfw/labtest-instances.yaml index 94cd029..475d8f7 100644 --- a/hieradata/codfw/labtest-instances.yaml +++ b/hieradata/codfw/labtest-instances.yaml @@ -1,6 +1,6 @@ -labsldapconfig: +labtest-instances::labsldapconfig: proxypass: 'lt-Eche0ieng8UaNoo' script_user_pass: 'lt-ueThe7moh7Hah' -passwords::root::extra_keys: +labtest-instances::passwords::root::extra_keys: alex: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDdYrWghgUYZZsdh8tw4mRfpsNWCW56ns6tKei3oSHEUNOXnxhAQwnwwkc1LeGYDdPglX3EAbtj0LAUf1muaC99mFYXw+e+7XjZCJYZ5cRrkvDXA/JvxaBvhOid8BZGImeoSqX2ZZ0HQSNRQfzVbs+7yAu0nMB3WSup9eoMnC3OfBsbPvQZ/WDD/OKIwuv8hnYyi8QmQgPngERqIf12ireGIXNn++IMncqu9Z6+skQHiuvkMsWlPjeYtg8gfIS8h8JY1QApVUyqkHuE4Fr/1n/NagsDu1WvE4zuEzQ3TmXZOtikPqSfsLDD5+gqxcaH1iiM+nEeG/RWD9/WyHnVUsIH [email protected] ubuntu laptop diff --git a/hieradata/codfw/postgresql/slave.yaml b/hieradata/codfw/postgresql/slave.yaml index a5e3188..c5f839f 100644 --- a/hieradata/codfw/postgresql/slave.yaml +++ b/hieradata/codfw/postgresql/slave.yaml @@ -1 +1 @@ -replication_pass: yustadummypass +postgresql::slave::replication_pass: yustadummypass diff --git a/hieradata/common/conftool.yaml b/hieradata/common/conftool.yaml index 9743fa9..6233789 100644 --- a/hieradata/common/conftool.yaml +++ b/hieradata/common/conftool.yaml @@ -1 +1 @@ -password: another_secret +conftool::password: another_secret diff --git a/hieradata/common/etcd/auth/common.yaml b/hieradata/common/etcd/auth/common.yaml index 348da24..6a9dac3 100644 --- a/hieradata/common/etcd/auth/common.yaml +++ b/hieradata/common/etcd/auth/common.yaml @@ -1 +1 @@ -root_password: secret +etcd::auth::common::root_password: secret diff --git a/hieradata/common/icinga/monitor/gsb.yaml b/hieradata/common/icinga/monitor/gsb.yaml index 1e0e7a1..c1e1ccd 100644 --- a/hieradata/common/icinga/monitor/gsb.yaml +++ b/hieradata/common/icinga/monitor/gsb.yaml @@ -1,2 +1,2 @@ -client_id: aclientid -api_key: anapikey +icinga::monitor::gsb::client_id: aclientid +icinga::monitor::gsb::api_key: anapikey diff --git a/hieradata/common/puppetdb/password.yaml b/hieradata/common/puppetdb/password.yaml index ba2f65d..bce623a 100644 --- a/hieradata/common/puppetdb/password.yaml +++ b/hieradata/common/puppetdb/password.yaml @@ -1,2 +1,2 @@ -rw: somepassword -replication: replication +puppetdb::password::rw: somepassword +puppetdb::password::replication: replication diff --git a/hieradata/common/swift/params.yaml b/hieradata/common/swift/params.yaml index f423ec9..aa856ca 100644 --- a/hieradata/common/swift/params.yaml +++ b/hieradata/common/swift/params.yaml @@ -1,4 +1,4 @@ -replication_keys: +swift::params::replication_keys: mw_media: key: 'key1' key2: 'key2' diff --git a/hieradata/eqiad/cdh/hue.yaml b/hieradata/eqiad/cdh/hue.yaml index d73c75d..c34c272 100644 --- a/hieradata/eqiad/cdh/hue.yaml +++ b/hieradata/eqiad/cdh/hue.yaml @@ -1 +1 @@ -database_password: "blabalbalabalalala" +cdh::hue::database_password: "blabalbalabalalala" diff --git a/hieradata/eqiad/osm.yaml b/hieradata/eqiad/osm.yaml index f25c11e..52be885 100644 --- a/hieradata/eqiad/osm.yaml +++ b/hieradata/eqiad/osm.yaml @@ -1 +1 @@ -postgresql_osmupdater_pass: dummypass +osm::postgresql_osmupdater_pass: dummypass -- To view, visit https://gerrit.wikimedia.org/r/315204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65e1ae278878f38330d28658385579811ca32cc0 Gerrit-PatchSet: 1 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
