diff options
Diffstat (limited to 'prototypes')
3 files changed, 20 insertions, 2 deletions
diff --git a/prototypes/puppet-infracloud/hiera/common_baremetal.yaml b/prototypes/puppet-infracloud/hiera/common_baremetal.yaml index 5ea00831c..9825ed367 100644 --- a/prototypes/puppet-infracloud/hiera/common_baremetal.yaml +++ b/prototypes/puppet-infracloud/hiera/common_baremetal.yaml @@ -115,7 +115,7 @@ default_network_interface: eno3 dhcp_static_mask: 255.255.255.128 dhcp_pool_start: 10.20.0.130 dhcp_pool_end: 10.20.0.254 -network_interface: eno1 +network_interface: eth1 ipv4_nameserver: 8.8.8.8 ipv4_subnet_mask: 255.255.255.0 ipv4_gateway: 172.30.13.1 @@ -131,6 +131,7 @@ ironic_inventory: ansible_ssh_host: 172.30.13.90 ipv4_gateway: 172.30.13.1 ipv4_interface_mac: 00:1e:67:f9:9b:35 + ipv4_subnet_mask: 255.255.255.192 name: controller00.opnfvlocal nics: - mac: a4:bf:01:01:a9:fc @@ -151,6 +152,7 @@ ironic_inventory: ipv4_address: 172.30.13.91 ansible_ssh_host: 172.30.13.91 ipv4_gateway: 172.30.13.1 + ipv4_interface_mac: 00:1e:67:f6:9b:37 ipv4_subnet_mask: 255.255.255.0 name: compute00.opnfvlocal nics: @@ -168,3 +170,4 @@ neutron_subnet_gateway: '172.30.13.1' neutron_subnet_allocation_pools: - 'start=172.30.13.100,end=172.30.13.254' virt_type: 'kvm' +dib_dev_user_password: devuser diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp index f09bfe2e9..8cbfef8c7 100644 --- a/prototypes/puppet-infracloud/manifests/site.pp +++ b/prototypes/puppet-infracloud/manifests/site.pp @@ -96,5 +96,6 @@ node 'baremetal.opnfvlocal', 'lfpod5-jumpserver' { ipv4_nameserver => hiera('ipv4_nameserver'), ipv4_subnet_mask => hiera('ipv4_subnet_mask'), bridge_name => hiera('bridge_name'), + dib_dev_user_password => hiera('dib_dev_user_password'), } } diff --git a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp index c4bff0962..a1e7d5d0e 100644 --- a/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp +++ b/prototypes/puppet-infracloud/modules/opnfv/manifests/server.pp @@ -224,6 +224,20 @@ class opnfv::server ( } } - # add hosts entries + # ensure that we have non-pass sudo, and + # not require tty + file_line { 'sudo_rule_no_pw': + path => '/etc/sudoers', + line => '%wheel ALL=(ALL) NOPASSWD: ALL', + } + file_line { 'sudo_rule_notty': + path => '/etc/sudoers', + line => 'Defaults requiretty', + match => '.*requiretty.*', + match_for_absence => true, + ensure => absent, + multiple => true, + } + create_resources('host', hiera_hash('hosts')) } |