From: Mark Tearle Date: Sun, 15 Mar 2015 10:23:31 +0000 (+0800) Subject: Update to add virtualcoke X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=18485d9f5e68d1b650edf5a0f6e5a49fe06a83c0;p=uccvend-vagrant.git Update to add virtualcoke --- diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp index 84f1464..23c8524 100644 --- a/puppet/manifests/init.pp +++ b/puppet/manifests/init.pp @@ -14,8 +14,26 @@ file { "/vagrant/code": ensure => directory, } +# common dependencies + +package { 'python3': + ensure => present, +} + +package { 'python-pip': + ensure => present, +} + +package { 'npyscreen': + provider => pip, + ensure => present, +} + + + include uccvend-snackrom include virtualsnack +include virtualcoke include opendispense2 include uccvend-vendserver diff --git a/puppet/modules/uccvend-configs/templates/dispense-server.conf.erb b/puppet/modules/uccvend-configs/templates/dispense-server.conf.erb index 1da6ba1..282e44e 100644 --- a/puppet/modules/uccvend-configs/templates/dispense-server.conf.erb +++ b/puppet/modules/uccvend-configs/templates/dispense-server.conf.erb @@ -9,6 +9,7 @@ items_file items.cfg # PLC - coke brain #coke_modbus_address 130.95.13.73 coke_modbus_address 0.0.0.0 +coke_modbus_port 1502 # Zero price items, defaults to off test_mode no diff --git a/puppet/modules/virtualcoke/manifests/init.pp b/puppet/modules/virtualcoke/manifests/init.pp new file mode 100644 index 0000000..ad8d224 --- /dev/null +++ b/puppet/modules/virtualcoke/manifests/init.pp @@ -0,0 +1,20 @@ +# == Class: virtualcoke +# +class virtualcoke { + package { 'python-pymodbus' : + ensure => present + } + + package { 'python-twisted' : + ensure => present + } + + + vcsrepo { "/vagrant/code/virtualcoke": + ensure => present, + provider => git, + require => [ Package[ 'git' ] ], + source => "https://github.com/ucc/virtualcoke.git", + revision => 'master', + } +} diff --git a/puppet/modules/virtualsnack/manifests/init.pp b/puppet/modules/virtualsnack/manifests/init.pp index f13e8ed..ee5c0a9 100644 --- a/puppet/modules/virtualsnack/manifests/init.pp +++ b/puppet/modules/virtualsnack/manifests/init.pp @@ -1,19 +1,6 @@ # == Class: virtualsnack # class virtualsnack { - package { 'python3': - ensure => present, - } - - package { 'python-pip': - ensure => present, - } - - package { 'npyscreen': - provider => pip, - ensure => present, - } - vcsrepo { "/vagrant/code/virtualsnack": ensure => present, provider => git,