Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove Compass from genesis.
[genesis.git]
/
foreman
/
ci
/
opnfv_ksgen_settings_no_HA.yml
diff --git
a/foreman/ci/opnfv_ksgen_settings_no_HA.yml
b/foreman/ci/opnfv_ksgen_settings_no_HA.yml
index
79db257
..
3066038
100644
(file)
--- a/
foreman/ci/opnfv_ksgen_settings_no_HA.yml
+++ b/
foreman/ci/opnfv_ksgen_settings_no_HA.yml
@@
-3,6
+3,7
@@
global_params:
ha_flag: "false"
odl_flag: "true"
odl_control_ip:
ha_flag: "false"
odl_flag: "true"
odl_control_ip:
+ admin_network:
private_network:
storage_network:
public_network:
private_network:
storage_network:
public_network:
@@
-12,6
+13,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 }
@@
-67,8
+69,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
@@
-81,6
+83,9
@@
nodes:
admin_ip: compute_admin
ansible_ssh_pass: "Op3nStack"
admin_password: ""
admin_ip: compute_admin
ansible_ssh_pass: "Op3nStack"
admin_password: ""
+ cpus: 2
+ memory: 2048
+ disk: 40
groups:
- compute
- foreman_nodes
groups:
- compute
- foreman_nodes
@@
-88,8
+93,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
@@
-104,6
+109,9
@@
nodes:
private_mac: "10:23:45:67:87:AC"
ansible_ssh_pass: "Op3nStack"
admin_password: "octopus"
private_mac: "10:23:45:67:87:AC"
ansible_ssh_pass: "Op3nStack"
admin_password: "octopus"
+ cpus: 2
+ memory: 4096
+ disk: 40
groups:
- controller
- foreman_nodes
groups:
- controller
- foreman_nodes