diff options
-rw-r--r-- | docker/compute-post.yaml | 3 | ||||
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 13 | ||||
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 13 |
3 files changed, 3 insertions, 26 deletions
diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml index 3fc07561..60b831be 100644 --- a/docker/compute-post.yaml +++ b/docker/compute-post.yaml @@ -42,6 +42,9 @@ parameters: type: string description: Config manifests that will be used to step through the deployment. default: '' + RoleData: + type: json + default: {} resources: diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 3778271c..067207f2 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -24,19 +24,6 @@ if hiera('step') >= 2 { } #END STEP 2 if hiera('step') >= 4 { - - $nova_ipv6 = hiera('nova::use_ipv6', false) - if $nova_ipv6 { - $memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211') - } else { - $memcached_servers = suffix(hiera('memcache_node_ips'), ':11211') - } - - class { '::nova' : - memcached_servers => $memcached_servers - } - include ::nova::config - # Aodh class { '::aodh' : database_connection => hiera('aodh_mysql_conn_string'), diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 6df1de20..709d9968 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -43,19 +43,6 @@ if hiera('step') >= 2 { } #END STEP 2 if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) { - $nova_ipv6 = hiera('nova::use_ipv6', false) - if $nova_ipv6 { - $memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211') - } else { - $memcached_servers = suffix(hiera('memcache_node_ips'), ':11211') - } - - class { '::nova' : - memcached_servers => $memcached_servers - } - - include ::nova::config - # Aodh class { '::aodh' : database_connection => hiera('aodh_mysql_conn_string'), |