Commit 6682dfff authored by BERARD Benjamin's avatar BERARD Benjamin
Browse files

Merge branch 'ldapmasterglobal' into 'master'

[ldap-master/ldap-global] Swap alias and hostname between ldap-master and ldap-global

See merge request !159
parents b59c5e6f 7e002cb3
Pipeline #195423 passed with stages
in 10 minutes and 39 seconds
{ {
"alias": [ "alias": [
"ldap-master" "ldap-global"
], ],
"kind": "virtual", "kind": "virtual",
"network_adapters": { "network_adapters": {
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
} }
}, },
"type": "server", "type": "server",
"uid": "ldap-global" "uid": "ldap-master"
} }
\ No newline at end of file
...@@ -182,10 +182,10 @@ users-api: ...@@ -182,10 +182,10 @@ users-api:
users-api-devel: users-api-devel:
kind: virtual kind: virtual
network_adapters: {default: {ip: 172.16.47.107}} network_adapters: {default: {ip: 172.16.47.107}}
ldap-global: ldap-master:
kind: virtual kind: virtual
alias: alias:
- ldap-master - ldap-global
network_adapters: {default: {ip: 172.16.47.150}} network_adapters: {default: {ip: 172.16.47.150}}
bugzilla: bugzilla:
kind: virtual kind: virtual
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment