Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Allows domain name to be configured"
[genesis.git]
/
foreman
/
ci
/
opnfv_ksgen_settings.yml
diff --git
a/foreman/ci/opnfv_ksgen_settings.yml
b/foreman/ci/opnfv_ksgen_settings.yml
index
0478c60
..
a6d2207
100644
(file)
--- a/
foreman/ci/opnfv_ksgen_settings.yml
+++ b/
foreman/ci/opnfv_ksgen_settings.yml
@@
-45,6
+45,7
@@
global_params:
network_type: multi_network
default_gw:
no_dhcp: false
network_type: multi_network
default_gw:
no_dhcp: false
+domain_name: opnfv.com
foreman:
seed_values:
- { name: heat_cfn, oldvalue: true, newvalue: false }
foreman:
seed_values:
- { name: heat_cfn, oldvalue: true, newvalue: false }
@@
-100,8
+101,8
@@
workaround_vif_plugging: false
openstack_packstack_rpm: http://REPLACE_ME/brewroot/packages/openstack-puppet-modules/2013.2/9.el6ost/noarch/openstack-puppet-modules-2013.2-9.el6ost.noarch.rpm
nodes:
compute:
openstack_packstack_rpm: http://REPLACE_ME/brewroot/packages/openstack-puppet-modules/2013.2/9.el6ost/noarch/openstack-puppet-modules-2013.2-9.el6ost.noarch.rpm
nodes:
compute:
- name: oscompute11.
opnfv.com
- hostname: oscompute11.
opnfv.com
+ name: oscompute11.
{{ domain_name }}
+ hostname: oscompute11.
{{ domain_name }}
short_name: oscompute11
type: compute
host_type: baremetal
short_name: oscompute11
type: compute
host_type: baremetal
@@
-124,8
+125,8
@@
nodes:
- rdo
- neutron
controller1:
- rdo
- neutron
controller1:
- name: oscontroller1.
opnfv.com
- hostname: oscontroller1.
opnfv.com
+ name: oscontroller1.
{{ domain_name }}
+ hostname: oscontroller1.
{{ domain_name }}
short_name: oscontroller1
type: controller
host_type: baremetal
short_name: oscontroller1
type: controller
host_type: baremetal
@@
-150,8
+151,8
@@
nodes:
- rdo
- neutron
controller2:
- rdo
- neutron
controller2:
- name: oscontroller2.
opnfv.com
- hostname: oscontroller2.
opnfv.com
+ name: oscontroller2.
{{ domain_name }}
+ hostname: oscontroller2.
{{ domain_name }}
short_name: oscontroller2
type: controller
host_type: baremetal
short_name: oscontroller2
type: controller
host_type: baremetal
@@
-176,8
+177,8
@@
nodes:
- rdo
- neutron
controller3:
- rdo
- neutron
controller3:
- name: oscontroller3.
opnfv.com
- hostname: oscontroller3.
opnfv.com
+ name: oscontroller3.
{{ domain_name }}
+ hostname: oscontroller3.
{{ domain_name }}
short_name: oscontroller3
type: controller
host_type: baremetal
short_name: oscontroller3
type: controller
host_type: baremetal